summary refs log tree commit diff
path: root/pkgs/development/tools/misc/ccache
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-07-15 14:14:19 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-07-19 11:27:56 +0200
commit594ca3f1cfd5b188c440e9460dfbfece14706009 (patch)
treee8cf25bfaddd36c85f31a7b5ef6ee9789055db5b /pkgs/development/tools/misc/ccache
parent2d5769884d573aef748443ee1e686444ab58ba78 (diff)
downloadnixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar.gz
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar.bz2
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar.lz
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar.xz
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.tar.zst
nixpkgs-594ca3f1cfd5b188c440e9460dfbfece14706009.zip
ccache.links: make it a function of unwrappedCC
That way we can use a ccacheStdenv with e.g. a different CC:

stdenv = overrideCC gcc8Stdenv (ccacheWrapper.override { unwrappedCC
= gcc8Stdenv.cc.cc; });
Diffstat (limited to 'pkgs/development/tools/misc/ccache')
-rw-r--r--pkgs/development/tools/misc/ccache/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index c5cb277c256..ae7ecad7ea1 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -27,12 +27,10 @@ let ccache = stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  passthru = let
-      unwrappedCC = stdenv.cc.cc;
-    in {
+  passthru = {
     # A derivation that provides gcc and g++ commands, but that
     # will end up calling ccache for the given cacheDir
-    links = extraConfig: stdenv.mkDerivation rec {
+    links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec {
       name = "ccache-links";
       passthru = {
         isClang = unwrappedCC.isClang or false;