diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
commit | f037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch) | |
tree | af8c8369954890db69195a1e9394ce16c7640d7f /pkgs/development/libraries/xmlsec | |
parent | f08d6f0e2daf9f3d9daa070eee223855b33c430d (diff) | |
parent | 4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff) | |
download | nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.gz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.bz2 nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.lz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.xz nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.zst nixpkgs-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.zip |
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/development/libraries/xmlsec')
-rw-r--r-- | pkgs/development/libraries/xmlsec/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 8553e4b2a9a..32ce856eddd 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/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" ''; |