Merge pull request #115766 from marsam/update-ncspot

ncspot: 0.4.0 -> 0.5.0
This commit is contained in:
Sandro 2021-03-10 23:44:23 +01:00 committed by GitHub
commit d66647115a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions

View File

@ -0,0 +1,19 @@
Bump security-framework from 2.1.1 to 2.1.2
security-framework=2.1.1 doesn't build on Darwin 10.12.
https://github.com/kornelski/rust-security-framework/issues/124
--- c/Cargo.lock
+++ i/Cargo.lock
@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "security-framework"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
dependencies = [
"bitflags 1.2.1",
"core-foundation",

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
, withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
@ -14,22 +14,25 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
};
cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
nativeBuildInputs = [ pkg-config ];
cargoPatches = [ ./bump-security-framework-crate.patch ];
buildInputs = [ ncurses openssl ]
++ lib.optional stdenv.isDarwin libiconv
++ lib.optional withALSA alsaLib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio