From 2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:44:32 +0300 Subject: treewide: Make explicit that 'dev' output of openssl is used --- pkgs/tools/networking/curl/7.15.nix | 2 +- pkgs/tools/networking/curl/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking/curl') diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 06106c62b4ea..c3c16cc08b44 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) + ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d313b9b4dc34..f2e6117966f0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) + ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) -- cgit 1.4.1