diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-20 13:42:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-20 13:43:52 +0200 |
| commit | 615f64dcbe6de193a9c3b0e03591fe623fecaeb1 (patch) | |
| tree | 780a35dc17bd82e18e1b94343a39e33dc16d55de /pkgs/build-support/cc-wrapper | |
| parent | 855b3c48ab8d8129cddbcf250d6dfa586dbd16b7 (diff) | |
| download | nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar.gz nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar.bz2 nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar.lz nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar.xz nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.tar.zst nixlib-615f64dcbe6de193a9c3b0e03591fe623fecaeb1.zip | |
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.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ec024c72481d..57607ba25b95 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -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 = |