Merge pull request #122492 from MetaDark/ccache

ccache: 4.2.1 → 4.3
2021-05-18 19:24:42 +02:00
parent 58959f9d2d 3bd456e4b4
commit ed95b50a7b
3 changed files with 18 additions and 33 deletions
@@ -12759,12 +12759,12 @@ in
      inherit (stdenv) cc;
    };

-  ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }:
-    overrideCC stdenv (buildPackages.ccacheWrapper.override {
-      inherit extraConfig;
+  ccacheStdenv = lowPrio (makeOverridable ({ stdenv, ... } @ extraArgs:
+    overrideCC stdenv (buildPackages.ccacheWrapper.override ({
      inherit (stdenv) cc;
-    })) {
-      extraConfig = "";
+    } // lib.optionalAttrs (builtins.hasAttr "extraConfig" extraArgs) {
+      extraConfig = extraArgs.extraConfig;
+    }))) {
      inherit stdenv;
    });