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

gnupg: use libiconvOrEmpty instead of libiconv (not required for glibc platforms)

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-06-13 14:17:27 +10:00
parent 150a6a7063
commit b62aa175a2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
# '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, libiconv , libksba, coreutils, libiconvOrEmpty
, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null , useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null
, useUsb ? true, libusb ? null, useCurl ? true, curl ? null , useUsb ? true, libusb ? null, useCurl ? true, curl ? null
}: }:
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs buildInputs
= [ readline zlib libgpgerror libgcrypt libassuan libksba pth libiconv ] = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ]
++ libiconvOrEmpty
++ 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