diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-01 14:38:31 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:14 -0700 |
| commit | 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6 (patch) | |
| tree | 384fe271a82fe587f0e868abd3faad3f422fe306 /pkgs/stdenv/linux | |
| parent | d74901170af61063f6c23f70bde18beefb145aea (diff) | |
| download | nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar.gz nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar.bz2 nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar.lz nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar.xz nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.tar.zst nixlib-5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.zip | |
curl: Modernize build
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 10 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 013aa12d9564..9cc5d4700878 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -92,11 +92,7 @@ rec { aclSupport = false; })).crossDrv; - curlMinimal = (pkgs.curl.override { - zlibSupport = false; - sslSupport = false; - scpSupport = false; - }).crossDrv; + curl-light = pkgs.curl-light.crossDrv; busyboxMinimal = (pkgs.busybox.override { # TBD: uClibc is broken. @@ -170,8 +166,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curlMinimal}/bin/curl $out/bin - cp -d ${curlMinimal}/lib/libcurl* $out/lib + cp ${curl-light}/bin/curl $out/bin + cp -d ${curl-light}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 3ad81476c2e9..f9943fc5f199 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -10,12 +10,6 @@ rec { aclSupport = false; }); - curlMinimal = curl.override { - zlibSupport = false; - sslSupport = false; - scpSupport = false; - }; - busyboxMinimal = busybox.override { useUclibc = true; enableStatic = true; @@ -83,8 +77,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curlMinimal}/bin/curl $out/bin - cp -d ${curlMinimal}/lib/libcurl* $out/lib + cp ${curl-light}/bin/curl $out/bin + cp -d ${curl-light}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep |