Merge pull request #246681 from figsoda/fw
This commit is contained in:
commit
4ca71c86a7
|
@ -4,31 +4,39 @@
|
|||
, pkg-config
|
||||
, libgit2
|
||||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, Security
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fw";
|
||||
version = "2.16.1";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
repo = "fw";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nhkirjq2q9sxg4k2scy8vxlqa9ikvr5lid0f22vws07vif4kkfs";
|
||||
hash = "sha256-D3fwwjYLPDeWDRGO2HW0jcGhwrUWDTNQuJUnphN3wzI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-iD3SBSny0mYpmVEInYaylHn0AbtIqTOwJHdFeq3UBaM=";
|
||||
cargoHash = "sha256-5jlpX6cOwsn4EaZUDLSKmOqBQg/WmaPRFHQcCrlBvxc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
USER = "nixbld";
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A workspace productivity booster";
|
||||
|
|
|
@ -2508,9 +2508,7 @@ with pkgs;
|
|||
|
||||
fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { };
|
||||
|
||||
fw = callPackage ../tools/misc/fw {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
fw = callPackage ../tools/misc/fw { };
|
||||
|
||||
g810-led = callPackage ../misc/g810-led { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue