diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-07 22:24:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:52 +0200 |
| commit | 90a0c457751900fec6b8ef8e29b3554b7cec18aa (patch) | |
| tree | 2482ec3f4262e9929ffc4e7e102174df2db6b4db /pkgs/servers/shishi | |
| parent | 0dff97ec729409ca942ea85fd4cebb01d4496916 (diff) | |
| download | nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar.gz nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar.bz2 nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar.lz nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar.xz nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.tar.zst nixpkgs-90a0c457751900fec6b8ef8e29b3554b7cec18aa.zip | |
libtasn1: split "dev" and "doc" outputs
Diffstat (limited to 'pkgs/servers/shishi')
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index a97e6847a45..2e9e8bb5009 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, pkgconfig , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { # Fixes support for gcrypt 1.6+ patches = [ ./gcrypt-fix.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ @@ -62,11 +63,11 @@ stdenv.mkDerivation rec { '' + optionalString (optLibidn != null) '' -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \ '' + optionalString (optGnutls != null) '' - -e 's,\(-lgnutls\),-L${optGnutls}/lib \1,' \ + -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \ '' + '' -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \ -e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \ - -e 's,\(-ltasn1\),-L${libtasn1}/lib \1,' + -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,' ''; meta = { |