pyrox.dev
Merge pull request #146646 from bobrik/ivan/curl-getdev
+7
-7
pkgs/tools/networking/curl/default.nix
+7
-7
pkgs/tools/networking/curl/default.nix
···
96
96
# The build fails when using wolfssl with --with-ca-fallback
97
97
(lib.withFeature (!wolfsslSupport) "ca-fallback")
98
98
"--disable-manual"
99
-
(lib.withFeatureAs opensslSupport "openssl" openssl.dev)
100
-
(lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev)
101
-
(lib.withFeatureAs scpSupport "libssh2" libssh2.dev)
99
+
(lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
100
+
(lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
101
+
(lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
102
102
(lib.enableFeature ldapSupport "ldap")
103
103
(lib.enableFeature ldapSupport "ldaps")
104
-
(lib.withFeatureAs idnSupport "libidn" libidn.dev)
104
+
(lib.withFeatureAs idnSupport "libidn" (lib.getDev libidn))
105
105
(lib.withFeature brotliSupport "brotli")
106
106
]
107
-
++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}"
107
+
++ lib.optional wolfsslSupport "--with-wolfssl=${lib.getDev wolfssl}"
108
108
++ lib.optional c-aresSupport "--enable-ares=${c-ares}"
109
-
++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
109
+
++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
110
110
# For the 'urandom', maybe it should be a cross-system option
111
111
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
112
112
"--with-random=/dev/urandom"
···
126
126
# Install completions
127
127
make -C scripts install
128
128
'' + lib.optionalString scpSupport ''
129
-
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
129
+
sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la
130
130
'' + lib.optionalString gnutlsSupport ''
131
131
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
132
132
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4