diff options
| author | Michael Eden <themichaeleden@gmail.com> | 2019-03-16 11:45:23 -0400 |
|---|---|---|
| committer | Michael Eden <themichaeleden@gmail.com> | 2019-03-16 16:29:38 -0400 |
| commit | 268f15915bf10d77a955227d4007a200f8ebf657 (patch) | |
| tree | dedb217189de93b6821eb3d9611945603b91777c /pkgs/tools/security/gnupg | |
| parent | 33e9fa2367c973d91bd729adce12634cc010dc8c (diff) | |
| download | nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar.gz nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar.bz2 nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar.lz nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar.xz nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.tar.zst nixpkgs-268f15915bf10d77a955227d4007a200f8ebf657.zip | |
gnupg: use config flags to find lib prefix instead of their binary tools
Diffstat (limited to 'pkgs/tools/security/gnupg')
| -rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 254a345839b..1069eb3ee24 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror , libiconv, npth, gettext, texinfo, pcsclite, sqlite +, buildPackages # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext texinfo @@ -36,7 +38,13 @@ stdenv.mkDerivation rec { ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; - configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "--with-npth-prefix=${npth}" + ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; postInstall = '' mkdir -p $out/lib/systemd/user |