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

Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging

Browse Source 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
This commit is contained in:
Eelco Dolstra
2014-11-04 14:30:43 +01:00
parent ed867a50eb 899d81b37b
commit 7495c61d49
93 changed files with 1019 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ stdenv.mkDerivation {
sharedLibrary =
!stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic;
patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'";
preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'";
makeFlags = if linkStatic then "LDFLAGS=-static" else "";