mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): install nix_config.h and config.nix

Browse source 
This also installs the rest of corepkgs as a side-effect.

Change-Id: I67a42d45793d5e8fdad51c1f306eebf63e9c2868
Reviewed-on: https://cl.tvl.fyi/c/depot/+/548
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Luke Granger-Brown 2020-06-21 21:40:55 +01:00 committed by lukegb
parent 4ea8cc3730
commit b99829f142
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
third_party/nix/CMakeLists.txt vendored
View file

@ -40,5 +40,14 @@ add_subdirectory(glog)
# generate a configuration file (autoheader-style) to configure # generate a configuration file (autoheader-style) to configure
# certain symbols that Nix depends on. # certain symbols that Nix depends on.
configure_file(config.h.in nix_config.h @ONLY) configure_file(config.h.in nix_config.h @ONLY)
INSTALL(FILES "${PROJECT_BINARY_DIR}/nix_config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/nix")
# install corepkgs
configure_file(corepkgs/config.nix.in config.nix @ONLY)
INSTALL(DIRECTORY corepkgs
DESTINATION ${CMAKE_INSTALL_DATADIR}/nix
FILES_MATCHING
PATTERN "*.nix")
INSTALL(FILES "${PROJECT_BINARY_DIR}/config.nix" DESTINATION "${CMAKE_INSTALL_DATADIR}/nix/corepkgs")
add_subdirectory(src) add_subdirectory(src)

12
third_party/nix/config.h.in vendored
View file

@ -14,15 +14,15 @@
#define SYSTEM "x86_64-linux" #define SYSTEM "x86_64-linux"
// TODO(tazjin): some of these values are nonsensical for Nix // TODO(tazjin): some of these values are nonsensical for Nix
#define NIX_PREFIX "/usr/local" #define NIX_PREFIX "@CMAKE_INSTALL_PREFIX@"
#define NIX_STORE_DIR "/nix/store" #define NIX_STORE_DIR "/nix/store"
#define NIX_DATA_DIR "/usr/local/share" #define NIX_DATA_DIR "@CMAKE_INSTALL_FULL_DATADIR@"
#define NIX_LOG_DIR "/nix/var/log/nix" #define NIX_LOG_DIR "/nix/var/log/nix"
#define NIX_STATE_DIR "/nix/var/nix" #define NIX_STATE_DIR "/nix/var/nix"
#define NIX_CONF_DIR "/usr/local/etc/nix" #define NIX_CONF_DIR "/etc/nix"
#define NIX_LIBEXEC_DIR "/usr/local/libexec" #define NIX_LIBEXEC_DIR "@CMAKE_INSTALL_FULL_LIBEXECDIR@"
#define NIX_BIN_DIR "/usr/local/bin" #define NIX_BIN_DIR "@CMAKE_INSTALL_FULL_BINDIR@"
#define NIX_MAN_DIR "/usr/local/share/man" #define NIX_MAN_DIR "@CMAKE_INSTALL_FULL_MANDIR@"
#define SANDBOX_SHELL "/nix/store/zq8biwi5mj2lrn68kx0lk0fkpbqypyxd-busybox-1.31.1-x86_64-unknown-linux-musl/bin/busybox" #define SANDBOX_SHELL "/nix/store/zq8biwi5mj2lrn68kx0lk0fkpbqypyxd-busybox-1.31.1-x86_64-unknown-linux-musl/bin/busybox"

12
third_party/nix/corepkgs/config.nix.in vendored
View file

@ -11,12 +11,12 @@ in rec {
tar = "@tar@"; tar = "@tar@";
tarFlags = "@tarFlags@"; tarFlags = "@tarFlags@";
tr = "@tr@"; tr = "@tr@";
nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@"; nixBinDir = fromEnv "NIX_BIN_DIR" "@CMAKE_INSTALL_FULL_BINDIR@";
nixPrefix = "@prefix@"; nixPrefix = "@CMAKE_INSTALL_PREFIX@";
nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@"; nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@CMAKE_INSTALL_FULL_LIBEXECDIR@";
nixLocalstateDir = "@localstatedir@"; nixLocalstateDir = "/nix/var";
nixSysconfDir = "@sysconfdir@"; nixSysconfDir = "/etc";
nixStoreDir = fromEnv "NIX_STORE_DIR" "@storedir@"; nixStoreDir = fromEnv "NIX_STORE_DIR" "/nix/store";
# If Nix is installed in the Nix store, then automatically add it as # If Nix is installed in the Nix store, then automatically add it as
# a dependency to the core packages. This ensures that they work # a dependency to the core packages. This ensures that they work