about summary refs log tree commit diff
path: root/third_party/nix/corepkgs
diff options
context:
space:
mode:
authorLuke Granger-Brown <hg@lukegb.com>2020-06-21T20·40+0100
committerlukegb <lukegb@tvl.fyi>2020-06-21T23·49+0000
commitb99829f142a6de8360e282348b60b4c3c0f210b5 (patch)
tree0e643ecb45bdc40a01c0a7fff842b48e569faa18 /third_party/nix/corepkgs
parent4ea8cc373002ec547458c2ea8114f9a83222a4a2 (diff)
fix(3p/nix): install nix_config.h and config.nix r/1054
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>
Diffstat (limited to 'third_party/nix/corepkgs')
-rw-r--r--third_party/nix/corepkgs/config.nix.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/nix/corepkgs/config.nix.in b/third_party/nix/corepkgs/config.nix.in
index 32ce6b399f26..0e4a2f0c90c7 100644
--- a/third_party/nix/corepkgs/config.nix.in
+++ b/third_party/nix/corepkgs/config.nix.in
@@ -11,12 +11,12 @@ in rec {
   tar = "@tar@";
   tarFlags = "@tarFlags@";
   tr = "@tr@";
-  nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
-  nixPrefix = "@prefix@";
-  nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@";
-  nixLocalstateDir = "@localstatedir@";
-  nixSysconfDir = "@sysconfdir@";
-  nixStoreDir = fromEnv "NIX_STORE_DIR" "@storedir@";
+  nixBinDir = fromEnv "NIX_BIN_DIR" "@CMAKE_INSTALL_FULL_BINDIR@";
+  nixPrefix = "@CMAKE_INSTALL_PREFIX@";
+  nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@CMAKE_INSTALL_FULL_LIBEXECDIR@";
+  nixLocalstateDir = "/nix/var";
+  nixSysconfDir = "/etc";
+  nixStoreDir = fromEnv "NIX_STORE_DIR" "/nix/store";
 
   # If Nix is installed in the Nix store, then automatically add it as
   # a dependency to the core packages. This ensures that they work