diff options
| author | Arda Xi <arda@ardaxi.com> | 2015-12-27 20:56:52 +0100 |
|---|---|---|
| committer | Arda Xi <arda@ardaxi.com> | 2015-12-27 20:57:55 +0100 |
| commit | 7c173028485f6edea118d3d1c16a31e5bec3fa7c (patch) | |
| tree | a0126922b4de7bba86f32420c8dc4095b3e24cdc /pkgs/tools/security | |
| parent | ee0fae473cea2ded7d3ea59967d3c751605e9939 (diff) | |
| download | nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar.gz nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar.bz2 nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar.lz nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar.xz nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.tar.zst nixlib-7c173028485f6edea118d3d1c16a31e5bec3fa7c.zip | |
Make gpgkey2ssh use absolute path to gpg2, fixes #11912
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/20.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 14 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/gpgkey2ssh-21.patch | 13 |
4 files changed, 36 insertions, 1 deletions
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 36c877620f19..117fc41c1abe 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { = [ readline zlib libgpgerror libgcrypt libassuan libksba pth openldap bzip2 libusb curl libiconv ]; - patchPhase = '' + patches = [ ./gpgkey2ssh-20.patch ]; + + prePatch = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i '' + stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c"; + checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; doCheck = true; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 9390207e14ad..bafcd88f1b90 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -20,10 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; }; + patches = [ ./gpgkey2ssh-21.patch ]; + 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 autoreconfHook gettext texinfo diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch new file mode 100644 index 000000000000..b536a4fe50e3 --- /dev/null +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch @@ -0,0 +1,14 @@ +diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c +index 903fb5b..d5611dc 100644 +--- a/tools/gpgkey2ssh.c ++++ b/tools/gpgkey2ssh.c +@@ -266,7 +266,7 @@ main (int argc, char **argv) + keyid = argv[1]; + + ret = asprintf (&command, +- "gpg --list-keys --with-colons --with-key-data '%s'", ++ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'", + keyid); + assert (ret > 0); + + diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch new file mode 100644 index 000000000000..198869423e5c --- /dev/null +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch @@ -0,0 +1,13 @@ +diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c +index f12c5f4..2e3f2ac 100644 +--- a/tools/gpgkey2ssh.c ++++ b/tools/gpgkey2ssh.c +@@ -281,7 +281,7 @@ main (int argc, char **argv) + keyid = argv[1]; + + asprintf (&command, +- "gpg2 --list-keys --with-colons --with-key-data '%s'", ++ "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'", + keyid); + if (! command) + { |