Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.

pkgs/development/libraries/gpgme/default.nix

@@ -5,10 +5,8 @@ assert useGnupg1 -> gnupg1 != null;
 assert !useGnupg1 -> gnupg != null;
 
 let
-  gpgPath = if useGnupg1 then
-    "${gnupg1}/bin/gpg"
-  else
-    "${gnupg}/bin/gpg2";
+  gpgStorePath = if useGnupg1 then gnupg1 else gnupg;
+  gpgProgram = if useGnupg1 then "gpg" else "gpg2";
 in
 stdenv.mkDerivation rec {
   name = "gpgme-1.6.0";
@@ -25,7 +23,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
-  configureFlags = "--with-gpg=${gpgPath}";
+  configureFlags = [
+    "--with-gpg=${gpgStorePath}/bin/${gpgProgram}"
+    "--enable-fixed-path=${gpgStorePath}/bin"
+  ];
 
   meta = with stdenv.lib; {
     homepage = "http://www.gnupg.org/related_software/gpgme";