public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinentry-mac: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 19:53:18 +02:00
parent 41d1294eab
commit e7765ba8e5
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/security/pinentry/mac.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses, cf-private }: { stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pinentry-mac-0.9.4"; name = "pinentry-mac-0.9.4";
@ -11,12 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ xcbuildHook ]; nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libiconv ncurses Cocoa ];
buildInputs = [
libiconv Cocoa ncurses
# Needed for OBJC_CLASS_$_NSArray symbols.
cf-private
];
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications

1
pkgs/top-level/all-packages.nix
View File

@ -5283,7 +5283,6 @@ in
}; };
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
xcbuildHook = xcbuild6Hook; xcbuildHook = xcbuild6Hook;
}; };