Merge remote-tracking branch 'upstream/staging' into deps-reorg

pkgs/development/libraries/xmlsec/default.nix

@@ -12,8 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+
+  buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ];
+
   enableParallelBuilding = true;
   doCheck = true;
 
@@ -24,6 +28,11 @@ stdenv.mkDerivation rec {
   # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909
   NIX_LDFLAGS = [ "-lgcrypt" ];
 
+  postInstall = ''
+    moveToOutput "bin/xmlsec1-config" "$dev"
+    moveToOutput "lib/xmlsec1Conf.sh" "$dev"
+  '';
+
   postFixup = ''
     wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib"
   '';