diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-17T20·25+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-17T20·25+0100 |
| commit | 168ef124ef72abcb3e4574085a9cd5db194246ba (patch) | |
| tree | e39bf215725ccbf2fc72bae9e0fc96b0c77eb0a3 /third_party | |
| parent | f605577d5ceb91196136f5e357f8224ae5ab86fb (diff) | |
fix(3p/nix): Minor fixes to derivation r/747
* version must be set to use this as the system Nix * missing busybox path is now set * fixed build output names
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/default.nix | 2 | ||||
| -rw-r--r-- | third_party/nix/default.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 8e05396359..2660ac34b6 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -125,7 +125,7 @@ let boehmgc boost # urgh brotli - busybox + busybox-sandbox-shell curl docbook5 docbook_xsl_ns diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index a5a8831f05..d3bcc4e65e 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -14,7 +14,8 @@ let enableLargeConfig = true; }; in stdenv.mkDerivation { - name = "nix"; + pname = "nix"; + version = "2.3.4"; src = ./.; nativeBuildInputs = with pkgs; [ @@ -35,6 +36,7 @@ in stdenv.mkDerivation { curl editline flex + largeBoehm libseccomp libsodium openssl @@ -42,8 +44,8 @@ in stdenv.mkDerivation { xz ]; - propagatedBuildInputs = [ - largeBoehm + mesonFlags = [ + "-Dsandbox_shell=${pkgs.busybox-sandbox-shell}/bin/busybox" ]; # Install the various symlinks to the Nix binary which users expect @@ -62,7 +64,7 @@ in stdenv.mkDerivation { ln -s $out/bin/nix $out/bin/nix-store mkdir -p $out/libexec/nix - ln -s $out/bin/nix $out/libexec/nix/remote-build + ln -s $out/bin/nix $out/libexec/nix/build-remote ''; # TODO(tazjin): equivalent of --enable-gc |