From 8ccce8de891923b40b897c11f9a494c6b3722a58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Sep 2017 19:49:21 +0200 Subject: [PATCH] Add more dev outputs --- pkgs/desktops/gnome-2/platform/libbonoboui/default.nix | 2 ++ pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 2 ++ pkgs/development/libraries/xmlsec/default.nix | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index efdc28aac424..a71d6eb789ba 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 961fb1c0a199..d30c38a2cfc4 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index c64970f8f86e..c55a3020b442 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ]; + enableParallelBuilding = true; doCheck = true; @@ -23,6 +26,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" '';