curl: Get rid of crossAttrs
This commit is contained in:
parent
aa9dba9c39
commit
c99de14e60
|
@ -74,7 +74,10 @@ stdenv.mkDerivation rec {
|
|||
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
||||
]
|
||||
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
|
||||
++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
|
||||
++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
|
||||
# For the 'urandom', maybe it should be a cross-system option
|
||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"--with-random=/dev/urandom";
|
||||
|
||||
CXX = "${stdenv.cc.targetPrefix}c++";
|
||||
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
|
||||
|
@ -90,16 +93,6 @@ stdenv.mkDerivation rec {
|
|||
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
# We should refer to the cross built openssl
|
||||
# For the 'urandom', maybe it should be a cross-system option
|
||||
configureFlags = [
|
||||
( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
|
||||
( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
|
||||
"--with-random /dev/urandom"
|
||||
];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit sslSupport openssl;
|
||||
};
|
||||
|
|
|
@ -78,7 +78,10 @@ stdenv.mkDerivation rec {
|
|||
( if brotliSupport then "--with-brotli" else "--without-brotli" )
|
||||
]
|
||||
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
|
||||
++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
|
||||
++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}"
|
||||
# For the 'urandom', maybe it should be a cross-system option
|
||||
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
|
||||
"--with-random=/dev/urandom";
|
||||
|
||||
CXX = "${stdenv.cc.targetPrefix}c++";
|
||||
CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
|
||||
|
@ -94,16 +97,6 @@ stdenv.mkDerivation rec {
|
|||
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
# We should refer to the cross built openssl
|
||||
# For the 'urandom', maybe it should be a cross-system option
|
||||
configureFlags = [
|
||||
( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
|
||||
( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
|
||||
"--with-random=/dev/urandom"
|
||||
];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit sslSupport openssl;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue