diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:44:32 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:02:23 +0200 |
commit | 2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33 (patch) | |
tree | 7df642b3d8c4882ea468cb53579882f9918fb114 /pkgs/tools/networking | |
parent | 5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9 (diff) | |
download | nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar.gz nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar.bz2 nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar.lz nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar.xz nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.tar.zst nixlib-2a73de6e6c7899e34b8cd8f3a625e7c18d3ead33.zip |
treewide: Make explicit that 'dev' output of openssl is used
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/curl/7.15.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/mailsend/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/sstp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/stunnel/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/uwimap/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/vtun/default.nix | 4 |
7 files changed, 9 insertions, 9 deletions
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" ) diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index 363c22c8bb89..b5fc484e6b1c 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ]; meta = { inherit (s) version; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index ed28db45f100..6dbd62679939 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" "--with-runtime-dir=/run/sstpc" "--with-pppd-plugin-dir=$(out)/lib/pppd" ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index e8b56ed7d966..96169ab294ce 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; configureFlags = [ - "--with-ssl=${openssl}" + "--with-ssl=${openssl.dev}" "--sysconfdir=/etc" "--localstatedir=/var" ]; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index e2c83bcb975c..9d4ae5d671ac 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patchPhase = '' - sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl},' + sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},' sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,' sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' ''; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-I${openssl}/include/openssl"; + "-I${openssl.dev}/include/openssl"; installPhase = '' mkdir -p $out/bin $out/lib $out/include diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index e14326fe9e62..b0397149e60d 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { configureFlags = '' --with-lzo-headers=${lzo}/include/lzo - --with-ssl-headers=${openssl}/include/openssl - --with-blowfish-headers=${openssl}/include/openssl''; + --with-ssl-headers=${openssl.dev}/include/openssl + --with-blowfish-headers=${openssl.dev}/include/openssl''; meta = with stdenv.lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; |