From 4e296383236cb8ba443a08704a44140aaef6eba7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 21 Mar 2017 23:50:53 +0100
Subject: [PATCH] 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.
---
 pkgs/development/libraries/gpgme/default.nix | 3 +++
 pkgs/tools/security/fwknop/default.nix       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index e4bb0c52c77..2ab0977004c 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r";
   };
 
+  outputs = [ "out" "dev" "info" ];
+  outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
+
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 325d220a523..823bdbbffb5 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 ''