about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSebastian Ullrich <sebasti@nullri.ch>2019-09-16 14:48:32 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-09-16 15:16:20 +0200
commit046ea6d08fce7bdc6360905adafae793310edfc2 (patch)
treea550a49bdbb2624b8a5987445b9b3df4254d9322 /pkgs
parent054f01ee1ba7ea86f8442b7dcc9d99b8aece5427 (diff)
ccacheWrapper: make usable with clang
Override original `wrapCCWith` call to preserve essential arguments
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3114319dec459..7668880edbf2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9278,8 +9278,11 @@ in
   #     };
   # You can use a different directory, but whichever directory you choose
   # should be owned by user root, group nixbld with permissions 0770.
-  ccacheWrapper = makeOverridable ({ extraConfig ? "", unwrappedCC ? stdenv.cc.cc }:
-     wrapCC (ccache.links {inherit unwrappedCC extraConfig;})) {};
+  ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }:
+    cc.override { cc = ccache.links {
+      inherit extraConfig;
+      unwrappedCC = cc.cc;
+    }; }) {};
   ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper);
 
   cccc = callPackage ../development/tools/analysis/cccc { };