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

clang: Add compat lib attribute to have stdenv.cc.cc.lib always work

Browse Source 
Fixes tarball evaluation:

http://hydra.nixos.org/build/35042997/nixlog/1/raw
This commit is contained in:
Tuomas Tynkkynen 2016-05-02 00:55:08 +03:00
parent ef44e78849
commit 36c4c73575
3 changed files with 132 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/3.6/clang/default.nix
View File

@ -2,7 +2,7 @@
let let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "clang-${version}"; name = "clang-${version}";
unpackPhase = '' unpackPhase = ''
@ -41,6 +41,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
isClang = true; isClang = true;
} // stdenv.lib.optionalAttrs stdenv.isLinux { } // stdenv.lib.optionalAttrs stdenv.isLinux {
inherit gcc; inherit gcc;
@ -52,4 +53,5 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} };
in self

6
pkgs/development/compilers/llvm/3.7/clang/default.nix
View File

@ -2,7 +2,7 @@
let let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "clang-${version}"; name = "clang-${version}";
unpackPhase = '' unpackPhase = ''
@ -41,6 +41,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
isClang = true; isClang = true;
} // stdenv.lib.optionalAttrs stdenv.isLinux { } // stdenv.lib.optionalAttrs stdenv.isLinux {
inherit gcc; inherit gcc;
@ -52,4 +53,5 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} };
in self

6
pkgs/development/compilers/llvm/3.8/clang/default.nix
View File

@ -2,7 +2,7 @@
let let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "clang-${version}"; name = "clang-${version}";
unpackPhase = '' unpackPhase = ''
@ -41,6 +41,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { passthru = {
lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
isClang = true; isClang = true;
} // stdenv.lib.optionalAttrs stdenv.isLinux { } // stdenv.lib.optionalAttrs stdenv.isLinux {
inherit gcc; inherit gcc;
@ -52,4 +53,5 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} };
in self