From ab450f8477e30b211798de97e197c2e77799acd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Mar 2016 10:12:15 +0100 Subject: [PATCH] gnupg-2.1: add myself as maintainer plus minor cosmetic --- pkgs/tools/security/gnupg/21.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index b7231454c45..0af041e63df 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -20,24 +20,24 @@ stdenv.mkDerivation rec { sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p"; }; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' - sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; #" fix Emacs syntax highlighting :-( - - postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; - buildInputs = [ pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo readline libusb gnutls adns openldap zlib bzip2 ]; + postPatch = stdenv.lib.optionalString stdenv.isLinux '' + sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + ''; #" fix Emacs syntax highlighting :-( + configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; + meta = with stdenv.lib; { homepage = http://gnupg.org; description = "a complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington simons ]; platforms = platforms.all; }; }