diff options
author | Ivan Babrou <github@ivan.computer> | 2021-11-19 09:26:48 -0800 |
---|---|---|
committer | Ivan Babrou <github@ivan.computer> | 2021-11-24 13:51:03 -0800 |
commit | 0b918814571265fd5d3f754085be4d070150e4dd (patch) | |
tree | 8bd8cc870ca22bd4fecf829284ef59af46ef71d8 /pkgs/tools | |
parent | 97cf632e63180329162329589c42de09e7971871 (diff) | |
download | nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar.gz nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar.bz2 nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar.lz nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar.xz nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.tar.zst nixpkgs-0b918814571265fd5d3f754085be4d070150e4dd.zip |
curl: use lib.getDev to allow building with boringssl
As suggested here: https://github.com/NixOS/nixpkgs/pull/143477#issuecomment-974180167
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5937249c079..0cd31a82813 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -96,17 +96,17 @@ stdenv.mkDerivation rec { # The build fails when using wolfssl with --with-ca-fallback (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" - (lib.withFeatureAs opensslSupport "openssl" openssl.dev) - (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) - (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl)) + (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls)) + (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2)) (lib.enableFeature ldapSupport "ldap") (lib.enableFeature ldapSupport "ldaps") - (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeatureAs idnSupport "libidn" (lib.getDev libidn)) (lib.withFeature brotliSupport "brotli") ] - ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" + ++ lib.optional wolfsslSupport "--with-wolfssl=${lib.getDev wolfssl}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" + ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}" # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { # Install completions make -C scripts install '' + lib.optionalString scpSupport '' - sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la + sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la '' + lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 |