diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libtasn1/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/shishi/default.nix | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 1ae26c48fc2..a7007da3a01 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4"; }; + outputs = [ "dev" "out" "doc" ]; # it's dev-doc only, lots of it + outputBin = "dev"; + buildInputs = [ perl texinfo ]; doCheck = true; 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 = { |