MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zlib: don't really override CC at ay point

Browse source 
but leave the preConfigure script as it was when not cross building in order to avoid hash breakage
This commit is contained in:
Ross MacLeod 2017-05-30 22:20:15 -04:00 committed by John Ericson
parent 38b2bd2f28
commit f63f96ae35
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/zlib/default.nix
View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl, static ? false }: { stdenv
, fetchurl
, buildPlatform, hostPlatform
, static ? false
}:
let version = "1.2.11"; in let version = "1.2.11"; in
@ -24,7 +28,9 @@ stdenv.mkDerivation rec {
setOutputFlags = false; setOutputFlags = false;
outputDoc = "dev"; # single tiny man3 page outputDoc = "dev"; # single tiny man3 page
preConfigure = '' # TODO(@Dridus) CC set by cc-wrapper setup-hook, so just empty out the preConfigure script when cross building, but leave the old incorrect script when not
# cross building to avoid hash breakage. Once hash breakage is acceptable, remove preConfigure entirely.
preConfigure = stdenv.lib.optionalString (hostPlatform == buildPlatform) ''
if test -n "$crossConfig"; then if test -n "$crossConfig"; then
export CC=$crossConfig-gcc export CC=$crossConfig-gcc
fi fi