arcuru/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Use nativeBuildInputs

Browse source
This commit is contained in:
Matthew Bauer 2019-02-06 22:43:28 -05:00
parent 1996af425a
commit e9072ded97
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
release-common.nix
View file

@ -47,19 +47,21 @@ rec {
autoreconfHook autoreconfHook
]; ];
nativeBuildDeps =
[ buildPackages.pkgconfig
# Tests
buildPackages.git
buildPackages.mercurial
] ++ lib.optional stdenv.isLinux buildPackages.utillinuxMinimal;
buildDeps = buildDeps =
[ curl [ curl
bzip2 xz brotli editline bzip2 xz brotli editline
openssl sqlite boehmgc openssl sqlite boehmgc
boost boost
buildPackages.pkgconfig
# Tests
buildPackages.git
buildPackages.mercurial
] ]
++ lib.optionals stdenv.isLinux [libseccomp buildPackages.utillinuxMinimal] ++ lib.optional stdenv.isLinux libseccomp
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
((aws-sdk-cpp.override { ((aws-sdk-cpp.override {

3
release.nix
View file

@ -24,6 +24,7 @@ let
src = nix; src = nix;
inherit officialRelease; inherit officialRelease;
nativeBuildInputs = nativeBuildDeps;
buildInputs = tarballDeps ++ buildDeps; buildInputs = tarballDeps ++ buildDeps;
configureFlags = "--enable-gc"; configureFlags = "--enable-gc";
@ -67,6 +68,7 @@ let
name = "nix"; name = "nix";
src = tarball; src = tarball;
nativeBuildInputs = nativeBuildDeps;
buildInputs = buildDeps; buildInputs = buildDeps;
preConfigure = preConfigure =
@ -199,6 +201,7 @@ let
name = "nix-build"; name = "nix-build";
src = tarball; src = tarball;
nativeBuildInputs = nativeBuildDeps;
buildInputs = buildDeps; buildInputs = buildDeps;
dontInstall = false; dontInstall = false;