max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-09-24 18:28:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use buildPackages for native dependencies

Browse source 
Unfortunately, releaseTools.nixBuild does not separate native and
non-native build inputs. As an alternative, we can just use
buildPackages to get the native version of some packages like:

- pkgconfig
- git
- curl
- utillinux
This commit is contained in:
Matthew Bauer 2019-02-06 21:43:47 -05:00
parent 15833516a4
commit 1996af425a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
release-common.nix
View file

@ -50,14 +50,16 @@ rec {
buildDeps = buildDeps =
[ curl [ curl
bzip2 xz brotli editline bzip2 xz brotli editline
openssl pkgconfig sqlite boehmgc openssl sqlite boehmgc
boost boost
buildPackages.pkgconfig
# Tests # Tests
git buildPackages.git
mercurial buildPackages.mercurial
] ]
++ lib.optionals stdenv.isLinux [libseccomp utillinuxMinimal] ++ lib.optionals stdenv.isLinux [libseccomp buildPackages.utillinuxMinimal]
++ 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 {