diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
| commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
| tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/tools/compression/bzip2 | |
| parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
| parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) | |
| download | nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.gz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.bz2 nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.lz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.xz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.zst nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.zip | |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/tools/compression/bzip2')
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 675a44b838bb..ea2ee660a2ce 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -63,8 +63,9 @@ in stdenv.mkDerivation { mv "$bin/lib" "$static/" ''; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' + patchPhase = '' + substituteInPlace Makefile --replace CC=gcc CC=cc + substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc ''; preConfigure = '' |