Merge pull request from xrelkd/update/sccache

sccache: 0.2.14 -> 0.2.15
This commit is contained in:
Sandro 2021-02-09 09:47:28 +01:00 committed by GitHub
commit efb23ed564
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 23 deletions
pkgs
development/tools/misc/sccache
top-level

View File

@ -1,37 +1,26 @@
{ stdenv { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }:
, lib
, fetchFromGitHub
, cargo
, rustc
, rustPlatform
, pkg-config
, glib
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "0.2.14"; version = "0.2.15";
pname = "sccache"; pname = "sccache";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "sccache"; repo = "sccache";
rev = version; rev = "v${version}";
sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb";
}; };
cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda";
cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj";
cargoBuildFlags = [ "--features=all" ]; cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
pkg-config cargo rustc nativeBuildInputs = [ pkg-config ];
]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
buildInputs = [
openssl
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
# Tests fail because of client server setup which is not possible inside the pure environment, # Tests fail because of client server setup which is not possible inside the pure environment,
# see https://github.com/mozilla/sccache/issues/460 # see https://github.com/mozilla/sccache/issues/460
checkPhase = null; doCheck = false;
meta = with lib; { meta = with lib; {
description = "Ccache with Cloud Storage"; description = "Ccache with Cloud Storage";

View File

@ -29675,7 +29675,9 @@ in
imatix_gsl = callPackage ../development/tools/imatix_gsl {}; imatix_gsl = callPackage ../development/tools/imatix_gsl {};
sccache = callPackage ../development/tools/misc/sccache { }; sccache = callPackage ../development/tools/misc/sccache {
inherit (darwin.apple_sdk.frameworks) Security;
};
sequeler = callPackage ../applications/misc/sequeler { }; sequeler = callPackage ../applications/misc/sequeler { };