about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/sccache/default.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-11 18:01:20 +0000
committerGitHub <noreply@github.com>2024-01-11 18:01:20 +0000
commit06797d4df4baaa51b229081083a88b92dac3ff7c (patch)
treeea3e27c5d50679d613e56850c6137392bcd23c68 /pkgs/development/tools/misc/sccache/default.nix
parentacd19036aca8b793f7f0099881d498c50b5ee147 (diff)
parenta2f82b9b840d6120464b853b8c6efb462899c716 (diff)
downloadnixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar.gz
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar.bz2
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar.lz
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar.xz
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.tar.zst
nixlib-06797d4df4baaa51b229081083a88b92dac3ff7c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc/sccache/default.nix')
-rw-r--r--pkgs/development/tools/misc/sccache/default.nix30
1 files changed, 22 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 927281d62c1a..cd258f003cb7 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,23 +1,37 @@
-{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+, stdenv
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
-  version = "0.7.4";
+  version = "0.7.5";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = "v${version}";
-    sha256 = "sha256-r5Gev6tnaq8KY26Zl5aDxTomAFw3SPK3szrS4Kc14cI=";
+    sha256 = "sha256-rql5Nj/w7cNaO6UKK96vYYE2E19RIiCHYHTnbW+U4n8=";
   };
 
-  cargoSha256 = "sha256-4YeD4UxqhLRg2d2INbMAHrJBTlvuafrKEcjohBDx6CQ=";
+  cargoHash = "sha256-VdI39DgQrUZhoawMqBC6ngTvldW+QbDjMjxjjbH9G1A=";
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
 
-  # Tests fail because of client server setup which is not possible inside the pure environment,
-  # see https://github.com/mozilla/sccache/issues/460
+  # Tests fail because of client server setup which is not possible inside the
+  # pure environment, see https://github.com/mozilla/sccache/issues/460
   doCheck = false;
 
   meta = with lib; {