git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92414 from matthewbauer/nix-cross

Fix nix cross compilatino

commit985071630e01193c236b14285f42bd95b573bd58 authorMatthew Bauer <mjbauer95@gmail.com> dateMon 6 Jul 2020, 10:41 (6 years ago) parentdae2a5800be3fa
1 file changed+4−3
pkgs/tools/package-management/nix/default.nix+4−3
pkgs/tools/package-management/nix/default.nix+4−3
@@ -42,14 +42,14 @@ common =
4242 nativeBuildInputs =
4343 [ pkgconfig ]
4444 ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
45− docbook5 docbook_xsl_ns jq gmock ];
45+ docbook5 docbook_xsl_ns jq ];
4646
4747 buildInputs =
4848 [ curl openssl sqlite xz bzip2 nlohmann_json
4949 brotli boost editline
5050 ]
5151 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
52− ++ lib.optionals is24 [ libarchive ]
52+ ++ lib.optionals is24 [ libarchive gmock ]
5353 ++ lib.optional withLibseccomp libseccomp
5454 ++ lib.optional withAWS
5555 ((aws-sdk-cpp.override {
@@ -119,7 +119,8 @@ common =
119119 # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
120120 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing";
121121
122− makeFlags = [ "profiledir=$(out)/etc/profile.d" ];
122+ makeFlags = [ "profiledir=$(out)/etc/profile.d" ]
123+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0";
123124
124125 installFlags = [ "sysconfdir=$(out)/etc" ];
125126