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

pinentry_mac: switch to pure version

Browse Source 
Fixes #24734
This commit is contained in:
Matthew Bauer 2017-04-12 02:59:54 -05:00
parent c90058e774
commit 457570f61a
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/security/pinentry-mac/default.nix
View File

@ -1,20 +1,22 @@
{ fetchurl, stdenv, xcbuild }: { fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pinentry-mac-0.9.4"; name = "pinentry-mac-0.9.4";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz"; owner = "matthewbauer";
sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271"; repo = "pinentry-mac";
rev = "77fc993d1040ed2319d9e53af78146be318c1fdd";
sha256 = "0rkmp6wb8wvmhipavn1bdmbw6564hc2b99dxqysr6yxr2xqs6fcz";
}; };
buildInputs = [ xcbuild ]; buildInputs = [ xcbuild libiconv Cocoa ncurses ];
dontUseXcbuild = true; dontUseXcbuild = true;
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv build/Release/pinentry-mac.app $out/Applications mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications
''; '';
passthru = { passthru = {

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

@ -3479,7 +3479,9 @@ with pkgs;
libcap = if stdenv.isDarwin then null else libcap; libcap = if stdenv.isDarwin then null else libcap;
}; };
pinentry_mac = callPackage ../tools/security/pinentry-mac { }; pinentry_mac = callPackage ../tools/security/pinentry-mac {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
pingtcp = callPackage ../tools/networking/pingtcp { }; pingtcp = callPackage ../tools/networking/pingtcp { };