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

Darwin: Add mig', lipo', etc. to `stdenvNative'.

Browse Source 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
Ludovic Courtès
2012-04-23 15:47:31 +00:00
parent 0a9d954bc6
commit 04600bbec1
31 changed files with 57 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/clang.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
let version = "3.0"; in
stdenv.mkDerivation {
name = "clang-${version}";
buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
buildInputs = [ perl llvm groff cmake ];
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];

5
pkgs/development/compilers/llvm/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }:
{ stdenv, fetchurl, perl, groff, cmake }:
let version = "3.0"; in
@@ -10,8 +10,7 @@ stdenv.mkDerivation {
sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
};
buildInputs = [ perl groff cmake ] ++
stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ];
buildInputs = [ perl groff cmake ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];