This commit is contained in:
Vladimír Čunát
2014-08-25 15:30:46 +02:00
parent 77da5efc78
commit 3ec413cece
11 changed files with 76 additions and 56 deletions
@@ -106,7 +106,10 @@ stdenv.mkDerivation ({
installFlags = [ "sysconfdir=$(out)/etc" ];
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
outputs = [ "out" "dev" "bin" "static" ];
buildInputs = [ stdenv.hookLib.multiout ]
++ stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig
++ stdenv.lib.optionals withGd [ gd libpng ];
@@ -25,8 +25,6 @@ in
builder = ./builder.sh;
outputs = [ "out" "dev" "bin" "static" ];
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
# store path than that determined when built (as a source for the