about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-11-18 07:59:40 +0000
committerJan Malakhovski <oxij@oxij.org>2018-11-18 07:59:40 +0000
commit50aef6015ff7f837348dfae9af8190d2744e6c77 (patch)
treecc1b31be775888e79f17e0adc6679a64af9424f4 /pkgs/top-level
parent617132eba723b79f69d1e8cc51f675f7cccd1452 (diff)
downloadnixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar.gz
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar.bz2
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar.lz
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar.xz
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.tar.zst
nixlib-50aef6015ff7f837348dfae9af8190d2744e6c77.zip
curl: move option defaults from `all-packages.nix` to the derivation itself
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719ff9a5d6b9..3915d91729c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2124,20 +2124,10 @@ with pkgs;
 
   curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
     fetchurl = fetchurlBoot;
-    http2Support = true;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
-    gssSupport = !stdenv.hostPlatform.isWindows;
   };
 
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
-    http2Support = true;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
-    gssSupport = !stdenv.hostPlatform.isWindows;
   };
 
   curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { };