diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-05-25 17:18:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 17:18:07 +0200 |
| commit | ef50f067f737081e51cce5567dd68b089fc937a5 (patch) | |
| tree | f222de478cc670cf18114261e7c83dc8315af487 /pkgs/top-level | |
| parent | 3bb35474b69085e10886a399d53434f9b9a97ce6 (diff) | |
| parent | 4b7a8ae94753d8cb3f11103bbc60144b9edc47b3 (diff) | |
Merge pull request #171043 from prusnak/curlWithGnuTls
treewide: refactor curlWithGnuTls into all-packages.nix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d248bcd2a99b..a492aed9cd1cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4998,6 +4998,8 @@ with pkgs; curlMinimal = callPackage ../tools/networking/curl { }; + curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -29664,11 +29666,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - spotify-unwrapped = callPackage ../applications/audio/spotify { - curl = curl.override { - opensslSupport = false; gnutlsSupport = true; - }; - }; + spotify-unwrapped = callPackage ../applications/audio/spotify { }; spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; |