Revert "gpgme: Drop multiple outputs (dev and info)"

This reverts commit 8727702. 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.
NixOS · Mar 21, 2017 · 4e29638 · 4e29638
1 parent 242031a
commit 4e29638
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 ''