curl: use --with/without-openssl instead of --with/without-ssl
This also migrates sslSupport to opensslSupport, which affects packages overriding the curl package in that regard.
This commit is contained in:
parent
106e944e19
commit
f651d617a6
|
@ -15,7 +15,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
|
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
|
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gitkraken";
|
pname = "gitkraken";
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# FileBot requires libcurl-gnutls.so to build
|
# FileBot requires libcurl-gnutls.so to build
|
||||||
curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; };
|
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ rec {
|
||||||
xorg.libICE
|
xorg.libICE
|
||||||
gnome2.GConf
|
gnome2.GConf
|
||||||
freetype
|
freetype
|
||||||
(curl.override { gnutlsSupport = true; sslSupport = false; })
|
(curl.override { gnutlsSupport = true; opensslSupport = false; })
|
||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
fontconfig
|
fontconfig
|
||||||
|
|
|
@ -187,7 +187,7 @@ in buildFHSUserEnv rec {
|
||||||
xorg.libICE
|
xorg.libICE
|
||||||
gnome2.GConf
|
gnome2.GConf
|
||||||
freetype
|
freetype
|
||||||
(curl.override { gnutlsSupport = true; sslSupport = false; })
|
(curl.override { gnutlsSupport = true; opensslSupport = false; })
|
||||||
nspr
|
nspr
|
||||||
nss
|
nss
|
||||||
fontconfig
|
fontconfig
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, idnSupport ? false, libidn ? null
|
, idnSupport ? false, libidn ? null
|
||||||
, ldapSupport ? false, openldap ? null
|
, ldapSupport ? false, openldap ? null
|
||||||
, zlibSupport ? true, zlib ? null
|
, zlibSupport ? true, zlib ? null
|
||||||
, sslSupport ? zlibSupport, openssl ? null
|
, opensslSupport ? zlibSupport, openssl ? null
|
||||||
, gnutlsSupport ? false, gnutls ? null
|
, gnutlsSupport ? false, gnutls ? null
|
||||||
, wolfsslSupport ? false, wolfssl ? null
|
, wolfsslSupport ? false, wolfssl ? null
|
||||||
, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
|
, scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null
|
||||||
|
@ -30,10 +30,10 @@ assert http2Support -> nghttp2 != null;
|
||||||
assert idnSupport -> libidn != null;
|
assert idnSupport -> libidn != null;
|
||||||
assert ldapSupport -> openldap != null;
|
assert ldapSupport -> openldap != null;
|
||||||
assert zlibSupport -> zlib != null;
|
assert zlibSupport -> zlib != null;
|
||||||
assert sslSupport -> openssl != null;
|
assert opensslSupport -> openssl != null;
|
||||||
assert !(gnutlsSupport && sslSupport);
|
assert !(gnutlsSupport && opensslSupport);
|
||||||
assert !(gnutlsSupport && wolfsslSupport);
|
assert !(gnutlsSupport && wolfsslSupport);
|
||||||
assert !(sslSupport && wolfsslSupport);
|
assert !(opensslSupport && wolfsslSupport);
|
||||||
assert gnutlsSupport -> gnutls != null;
|
assert gnutlsSupport -> gnutls != null;
|
||||||
assert wolfsslSupport -> wolfssl != null;
|
assert wolfsslSupport -> wolfssl != null;
|
||||||
assert scpSupport -> libssh2 != null;
|
assert scpSupport -> libssh2 != null;
|
||||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||||
optional zlibSupport zlib ++
|
optional zlibSupport zlib ++
|
||||||
optional gssSupport libkrb5 ++
|
optional gssSupport libkrb5 ++
|
||||||
optional c-aresSupport c-ares ++
|
optional c-aresSupport c-ares ++
|
||||||
optional sslSupport openssl ++
|
optional opensslSupport openssl ++
|
||||||
optional gnutlsSupport gnutls ++
|
optional gnutlsSupport gnutls ++
|
||||||
optional wolfsslSupport wolfssl ++
|
optional wolfsslSupport wolfssl ++
|
||||||
optional scpSupport libssh2 ++
|
optional scpSupport libssh2 ++
|
||||||
|
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
||||||
# The build fails when using wolfssl with --with-ca-fallback
|
# The build fails when using wolfssl with --with-ca-fallback
|
||||||
(lib.withFeature (!wolfsslSupport) "ca-fallback")
|
(lib.withFeature (!wolfsslSupport) "ca-fallback")
|
||||||
"--disable-manual"
|
"--disable-manual"
|
||||||
(lib.withFeatureAs sslSupport "ssl" openssl.dev)
|
(lib.withFeatureAs opensslSupport "openssl" openssl.dev)
|
||||||
(lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev)
|
(lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev)
|
||||||
(lib.withFeatureAs scpSupport "libssh2" libssh2.dev)
|
(lib.withFeatureAs scpSupport "libssh2" libssh2.dev)
|
||||||
(lib.enableFeature ldapSupport "ldap")
|
(lib.enableFeature ldapSupport "ldap")
|
||||||
|
@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit sslSupport openssl;
|
inherit opensslSupport openssl;
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -27763,7 +27763,7 @@ with pkgs;
|
||||||
|
|
||||||
spotify-unwrapped = callPackage ../applications/audio/spotify {
|
spotify-unwrapped = callPackage ../applications/audio/spotify {
|
||||||
curl = curl.override {
|
curl = curl.override {
|
||||||
sslSupport = false; gnutlsSupport = true;
|
opensslSupport = false; gnutlsSupport = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue