gcc_multi: disable the hook moving lib64 to lib

This was preventing wine from build, and we typically don't want it
anyway in multilib builds. /cc #8706.
This commit is contained in:
Vladimír Čunát
2015-07-20 13:43:52 +02:00
parent 855b3c48ab
commit 615f64dcbe
2 changed files with 12 additions and 7 deletions
+3 -2
View File
@@ -7,7 +7,7 @@
{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
, zlib ? null, extraPackages ? []
, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
, dyld ? null # TODO: should this be a setup-hook on dyld?
, isGNU ? false, isClang ? false
}:
@@ -232,7 +232,8 @@ stdenv.mkDerivation {
substituteAll ${./add-flags} $out/nix-support/add-flags.sh
cp -p ${./utils.sh} $out/nix-support/utils.sh
'';
''
+ extraBuildCommands;
# The dynamic linker has different names on different Linux platforms.
dynamicLinker =