public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92414 from matthewbauer/nix-cross

Browse Source 
Fix nix cross compilatino
This commit is contained in:
Matthew Bauer 2020-07-06 10:41:16 -04:00 committed by GitHub
commit 985071630e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/package-management/nix/default.nix
View File

@ -42,14 +42,14 @@ common =
nativeBuildInputs = nativeBuildInputs =
[ pkgconfig ] [ pkgconfig ]
++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
docbook5 docbook_xsl_ns jq gmock ]; docbook5 docbook_xsl_ns jq ];
buildInputs = buildInputs =
[ curl openssl sqlite xz bzip2 nlohmann_json [ curl openssl sqlite xz bzip2 nlohmann_json
brotli boost editline brotli boost editline
] ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive ] ++ lib.optionals is24 [ libarchive gmock ]
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS ++ lib.optional withAWS
((aws-sdk-cpp.override { ((aws-sdk-cpp.override {
@ -119,7 +119,8 @@ common =
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing";
makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; makeFlags = [ "profiledir=$(out)/etc/profile.d" ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0";
installFlags = [ "sysconfdir=$(out)/etc" ]; installFlags = [ "sysconfdir=$(out)/etc" ];