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

Add gpgme build input for sup

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-06-11 17:30:54 +10:00
parent 593228f18d
commit ee00c7aa4e
2 changed files with 8 additions and 6 deletions
pkgs
applications/networking/mailreaders/sup
default.nix
tools/security/gnupg
default.nix

4
pkgs/applications/networking/mailreaders/sup/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, ruby, rake, rubygems, makeWrapper }: { stdenv, fetchurl, ncurses, ruby, rake, rubygems, makeWrapper, gpgme }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
configurePhase = ""; configurePhase = "";
buildInputs = [ ncurses ruby rake rubygems makeWrapper ]; buildInputs = [ ncurses ruby rake rubygems makeWrapper gpgme ];
buildPhase = "rake gem"; buildPhase = "rake gem";

10
pkgs/tools/security/gnupg/default.nix
View File

@ -2,9 +2,9 @@
# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
{ fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan
, libksba, coreutils, useLdap ? true, openldap ? null , libksba, coreutils, libiconv
, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null , useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null
, useCurl ? true, curl ? null , useUsb ? true, libusb ? null, useCurl ? true, curl ? null
}: }:
assert useLdap -> (openldap != null); assert useLdap -> (openldap != null);
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; 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 useLdap openldap
++ stdenv.lib.optional useBzip2 bzip2 ++ stdenv.lib.optional useBzip2 bzip2
++ stdenv.lib.optional useUsb libusb ++ stdenv.lib.optional useUsb libusb
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i 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"; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check";