diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-04-12 22:20:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 22:20:57 -0400 |
| commit | f21a6940da9a70b25506069943eccdc0855750f3 (patch) | |
| tree | dae38986d19e0b5d3db957ab196cb876b7819958 /pkgs/tools | |
| parent | 1fd7bf9ee3e7e26526aca139ea881afd478932c3 (diff) | |
| parent | 9e5fe7738a5abdd2357c3d72899ca1712a36de3a (diff) | |
Merge pull request #24838 from matthewbauer/ibtool
pinentry_mac: use xcbuild
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/pinentry-mac/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 7116d1777d6da..4cba1c7e61723 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -1,20 +1,22 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }: stdenv.mkDerivation rec { name = "pinentry-mac-0.9.4"; - src = fetchurl { - url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz"; - sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271"; + src = fetchFromGitHub { + owner = "matthewbauer"; + repo = "pinentry-mac"; + rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4"; + sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq"; }; - postPatch = '' - substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild libiconv Cocoa ncurses ]; + + dontUseXcbuild = true; installPhase = '' mkdir -p $out/Applications - mv build/Release/pinentry-mac.app $out/Applications + mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications ''; passthru = { |