diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:17:36 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:17:36 +0100 |
| commit | a0f3faf34e6b2f024ef86d84ad80c124c33b941a (patch) | |
| tree | 11eed0d9ee2e444dde60899e8d290ca722bab1c3 /pkgs/tools/compression/bzip2/default.nix | |
| parent | 389143d808be38fe4e0def83946c5ab2fd7c5376 (diff) | |
| parent | cef0bcefc6544513fec9dec49686932ef15f1734 (diff) | |
| download | nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.gz nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.bz2 nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.lz nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.xz nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.tar.zst nixpkgs-a0f3faf34e6b2f024ef86d84ad80c124c33b941a.zip | |
Merge remote-tracking branch 'origin/glibc-2.20' into staging
Diffstat (limited to 'pkgs/tools/compression/bzip2/default.nix')
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 256f574c2e0..74da91431a4 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; sharedLibrary = - !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; + !stdenv.isDarwin && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'"; |