From 168ef124ef72abcb3e4574085a9cd5db194246ba Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 17 May 2020 21:25:50 +0100
Subject: fix(3p/nix): Minor fixes to derivation

* version must be set to use this as the system Nix
* missing busybox path is now set
* fixed build output names
---
 third_party/default.nix     |  2 +-
 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 8e0539635978..2660ac34b68f 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 a5a8831f0504..d3bcc4e65ee7 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
-- 
cgit 1.4.1