diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02 11:32:28 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:52 +0200 |
| commit | cde5053d9a9affc2c60b7446f5d091296d8fa139 (patch) | |
| tree | 2d53be2769610b7411f84ac816eeaec0b3ac3d7e /pkgs/stdenv/linux | |
| parent | 68493cd8dc25a1e2e4d1007305a39cc710855d86 (diff) | |
| download | nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar.gz nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar.bz2 nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar.lz nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar.xz nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.tar.zst nixlib-cde5053d9a9affc2c60b7446f5d091296d8fa139.zip | |
Revert "curl: Modernize build"
This reverts commit 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.
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, 15 insertions, 5 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 520bdd208e36..bf060329be6d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -92,7 +92,11 @@ rec { aclSupport = false; })).crossDrv; - curl-light = pkgs.curl-light.crossDrv; + curlMinimal = (pkgs.curl.override { + zlibSupport = false; + sslSupport = false; + scpSupport = false; + }).crossDrv; busyboxMinimal = (pkgs.busybox.override { # TBD: uClibc is broken. @@ -166,8 +170,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curl-light}/bin/curl $out/bin - cp -d ${curl-light}/lib/libcurl* $out/lib + cp ${curlMinimal}/bin/curl $out/bin + cp -d ${curlMinimal}/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 6bd67d8c7a01..a995606886f3 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -10,6 +10,12 @@ rec { aclSupport = false; }); + curlMinimal = curl.override { + zlibSupport = false; + sslSupport = false; + scpSupport = false; + }; + busyboxMinimal = busybox.override { useMusl = true; enableStatic = true; @@ -77,8 +83,8 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin - cp ${curl-light}/bin/curl $out/bin - cp -d ${curl-light}/lib/libcurl* $out/lib + cp ${curlMinimal}/bin/curl $out/bin + cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep |