Merge pull request #26805 from obsidiansystems/cross-elegant

Make cross compilation elegant
This commit is contained in:
John Ericson
2017-12-30 22:58:02 -05:00
committed by GitHub
88 changed files with 1059 additions and 699 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ stdenv.mkDerivation ({
outputs = [ "out" "bin" "dev" "static" ];
nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc;
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to