about summary refs log tree commit diff
path: root/pkgs/tools/security/fwknop
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2017-03-21 23:50:53 +0100
committerMichael Weiss <dev.primeos@gmail.com>2017-03-21 23:57:57 +0100
commit4e296383236cb8ba443a08704a44140aaef6eba7 (patch)
treeb35cee261535594c8148008be94c1fdb393328ec /pkgs/tools/security/fwknop
parent242031a34e27b626832ee86f884db27266b6c12e (diff)
downloadnixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar.gz
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar.bz2
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar.lz
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar.xz
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.tar.zst
nixlib-4e296383236cb8ba443a08704a44140aaef6eba7.zip
Revert "gpgme: Drop multiple outputs (dev and info)"
This reverts commit 872770286d04cadb9816cd1665d3d5f17adce456.

This will fix fwknop as well (should have done it like this in the first
place, where was my mind...).

Conclusion: Did something stupid... :o - I am *so incredibly sorry*,
will be way more careful (was already careful, but apparently not
enought...) next time and use nox.

Sorry @everyone and thanks @calvertvl for noticing this.
Diffstat (limited to 'pkgs/tools/security/fwknop')
-rw-r--r--pkgs/tools/security/fwknop/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 325d220a5235..823bdbbffb5d 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libpcap texinfo ]
-    ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme ]
+    ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ]
     ++ stdenv.lib.optional wgetSupport [ wget ];
 
   configureFlags = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     ${lib.optionalString (!buildClient) "--disable-client"}
     ${lib.optionalString gnupgSupport ''
       --with-gpgme
-      --with-gpgme-prefix=${gpgme}
+      --with-gpgme-prefix=${gpgme.dev}
       --with-gpg=${gnupg}
     ''}
     ${lib.optionalString wgetSupport ''