diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-09-18 15:34:27 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-09-18 15:58:53 +0200 |
| commit | 634824d50be0fbccd30359366db8a150eb25dabd (patch) | |
| tree | 903614919ca48189dc3e0ce85fa7a8b2db154f00 /pkgs/development/tools/misc/ccache | |
| parent | e2659de1b253c2948d7c2f5501f0e0246fc483e1 (diff) | |
| download | nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar.gz nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar.bz2 nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar.lz nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar.xz nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.tar.zst nixpkgs-634824d50be0fbccd30359366db8a150eb25dabd.zip | |
ccache: fix references to stdenv.cc.cc.isClang
afa64a60bc73a5b5b1340f9ec9daae198d49e5d2 breaks the tarball job https://hydra.nixos.org/build/40817224/nixlog/1/raw The problem is that there is a stdenv.cc.cc.isGNU but no corresponding stdenv.cc.cc.isClang. The "correct" fix would be to add stdenv.cc.cc.isClang but this is simpler.
Diffstat (limited to 'pkgs/development/tools/misc/ccache')
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index c98e3a20813..c90e356e044 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -19,15 +19,16 @@ let ccache = stdenv.mkDerivation rec { passthru = let cc = stdenv.cc.cc; - ccname = if stdenv.cc.cc.isClang or false then "clang" else "gcc"; - cxxname = if stdenv.cc.cc.isClang or false then "clang++" else "g++"; + ccname = if stdenv.cc.isClang then "clang" else "gcc"; + cxxname = if stdenv.cc.isClang then "clang++" else "g++"; in { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir links = extraConfig: stdenv.mkDerivation rec { name = "ccache-links"; passthru = { - inherit (cc) isGNU isClang; + inherit (stdenv.cc) isClang; + inherit (cc) isGNU; }; inherit (cc) lib; buildCommand = '' |