Revert "curl: Modernize build"

This reverts commit 5e3fe3916a.
This commit is contained in:
Eelco Dolstra
2015-06-02 11:32:28 +02:00
parent 68493cd8dc
commit cde5053d9a
4 changed files with 86 additions and 122 deletions

View File

@@ -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

View File

@@ -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