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

fix(3p/nix): Minor fixes to derivation

Browse source 
* 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:
Vincent Ambo 2020-05-17 21:25:50 +01:00
parent f605577d5c
commit 168ef124ef
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
third_party/default.nix vendored
View file

@ -125,7 +125,7 @@ let
boehmgc boehmgc
boost # urgh boost # urgh
brotli brotli
busybox busybox-sandbox-shell
curl curl
docbook5 docbook5
docbook_xsl_ns docbook_xsl_ns

10
third_party/nix/default.nix vendored
View file

@ -14,7 +14,8 @@ let
enableLargeConfig = true; enableLargeConfig = true;
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "nix"; pname = "nix";
version = "2.3.4";
src = ./.; src = ./.;
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
@ -35,6 +36,7 @@ in stdenv.mkDerivation {
curl curl
editline editline
flex flex
largeBoehm
libseccomp libseccomp
libsodium libsodium
openssl openssl
@ -42,8 +44,8 @@ in stdenv.mkDerivation {
xz xz
]; ];
propagatedBuildInputs = [ mesonFlags = [
largeBoehm "-Dsandbox_shell=${pkgs.busybox-sandbox-shell}/bin/busybox"
]; ];
# Install the various symlinks to the Nix binary which users expect # 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 ln -s $out/bin/nix $out/bin/nix-store
mkdir -p $out/libexec/nix 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 # TODO(tazjin): equivalent of --enable-gc