From 4223e83a68e358cda3d375428cf5edad597cdd9d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 30 Aug 2016 21:49:34 +0300 Subject: tcltls: Fix reference to openssl dev output --- pkgs/development/libraries/tcltls/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'pkgs/development/libraries/tcltls') diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 7d445408fa2..dc0504454f6 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -4,25 +4,27 @@ stdenv.mkDerivation rec { name = "tcltls-${version}"; version = "1.6"; - configureFlags = "--with-tcl=" + tcl + "/lib " - + "--with-tclinclude=" + tcl + "/include " - + "--with-ssl-dir=" + openssl; - - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - src = fetchurl { url = "mirror://sourceforge/tls/tls${version}-src.tar.gz"; sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; }; + buildInputs = [ tcl openssl ]; + + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tclinclude=${tcl}/include" + "--with-ssl-dir=${openssl.dev}" + ]; + + preConfigure = '' + configureFlags="--exec_prefix=$prefix $configureFlags" + ''; + passthru = { libPrefix = "tls${version}"; }; - buildInputs = [ tcl openssl ]; - meta = { homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; -- cgit 1.4.1