From f180441ee177d8ad5ddf3216003b701c665769f3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 8 Mar 2021 04:20:00 +0000 Subject: [PATCH] ncspot: 0.4.0 -> 0.5.0 https://github.com/hrkfdn/ncspot/releases/tag/v0.5.0 --- .../bump-security-framework-crate.patch | 19 +++++++++++++++++++ pkgs/applications/audio/ncspot/default.nix | 11 +++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/audio/ncspot/bump-security-framework-crate.patch diff --git a/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch new file mode 100644 index 000000000000..5c8008abb18a --- /dev/null +++ b/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch @@ -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", diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index e78eaca54909..ad8d64b97205 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -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