public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/glibc-2.20' into staging

Browse Source
This commit is contained in:
Eelco Dolstra
2014-11-16 22:17:36 +01:00
parent 389143d808 cef0bcefc6
commit a0f3faf34e
42 changed files with 235 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/bzip2/default.nix
View File

@@ -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'";