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
This commit is contained in:
parent
f605577d5c
commit
168ef124ef
2 changed files with 7 additions and 5 deletions
2
third_party/default.nix
vendored
2
third_party/default.nix
vendored
|
@ -125,7 +125,7 @@ let
|
|||
boehmgc
|
||||
boost # urgh
|
||||
brotli
|
||||
busybox
|
||||
busybox-sandbox-shell
|
||||
curl
|
||||
docbook5
|
||||
docbook_xsl_ns
|
||||
|
|
10
third_party/nix/default.nix
vendored
10
third_party/nix/default.nix
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue