diff options
| author | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-06-11 17:30:54 +1000 |
|---|---|---|
| committer | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-06-13 10:45:42 +1000 |
| commit | ee00c7aa4eab65f010328c11f196e870bf25a2bc (patch) | |
| tree | 6001028aa8ebbb9fd5803da49eea8e6ec4deaad7 /pkgs | |
| parent | 593228f18dea57fd5d538925fa79cec39ef4016d (diff) | |
| download | nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar.gz nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar.bz2 nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar.lz nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar.xz nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.tar.zst nixpkgs-ee00c7aa4eab65f010328c11f196e870bf25a2bc.zip | |
Add gpgme build input for sup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/sup/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/default.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index c657445617d..b1ef5dddda3 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, ruby, rake, rubygems, makeWrapper }: +{ stdenv, fetchurl, ncurses, ruby, rake, rubygems, makeWrapper, gpgme }: stdenv.mkDerivation { name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { configurePhase = ""; - buildInputs = [ ncurses ruby rake rubygems makeWrapper ]; + buildInputs = [ ncurses ruby rake rubygems makeWrapper gpgme ]; buildPhase = "rake gem"; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index b94e2e50a40..90a08bba42a 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -2,9 +2,9 @@ # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, useLdap ? true, openldap ? null -, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null -, useCurl ? true, curl ? null +, libksba, coreutils, libiconv +, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null +, useUsb ? true, libusb ? null, useCurl ? true, curl ? null }: assert useLdap -> (openldap != null); @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; }; - buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] + buildInputs + = [ readline zlib libgpgerror libgcrypt libassuan libksba pth libiconv ] ++ stdenv.lib.optional useLdap openldap ++ stdenv.lib.optional useBzip2 bzip2 ++ stdenv.lib.optional useUsb libusb @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' ''; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; |