diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2022-04-30 18:56:59 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2022-04-30 18:56:59 +0200 |
commit | 4b7a8ae94753d8cb3f11103bbc60144b9edc47b3 (patch) | |
tree | d4a0ea1d8f5dee1908a26cc17196871b5907a0e4 | |
parent | b29229e63e51c3a9b0da60d1e2fb8d93c5259c2a (diff) | |
download | nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar.gz nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar.bz2 nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar.lz nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar.xz nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.tar.zst nixpkgs-4b7a8ae94753d8cb3f11103bbc60144b9edc47b3.zip |
treewide: refactor curlWithGnuTls into all-packages.nix
-rw-r--r-- | pkgs/applications/audio/spotify/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/robo3t/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/version-management/gitkraken/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/video/filebot/default.nix | 8 | ||||
-rw-r--r-- | pkgs/build-support/appimage/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/steam/fhsenv.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
7 files changed, 10 insertions, 23 deletions
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 65cf657d8a4..14caa6db9c4 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -26,7 +26,7 @@ let atk cairo cups - curl + curlWithGnuTls dbus expat ffmpeg diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 8c644e5f3cc..81219fc7526 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, curl +, curlWithGnuTls , zlib , glib , xorg @@ -14,10 +14,6 @@ , makeWrapper }: -let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; -in - stdenv.mkDerivation rec { pname = "robo3t"; version = "1.4.3"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8d89420607a..9d543af2691 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -9,7 +9,6 @@ with lib; let - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; version = "8.4.0"; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index df435d03d09..ca0849a4f96 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,13 +1,7 @@ { lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook -, zlib, libzen, libmediainfo, curl, libmms, glib +, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib }: -let - # FileBot requires libcurl-gnutls.so to build - curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - -in - stdenv.mkDerivation rec { pname = "filebot"; version = "4.9.6"; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0bee6ce065a..2b208ad16dd 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -108,7 +108,7 @@ rec { xorg.libICE gnome2.GConf freetype - (curl.override { gnutlsSupport = true; opensslSupport = false; }) + curlWithGnuTls nspr nss fontconfig diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index d18accd0d54..86c04b5757a 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -155,7 +155,7 @@ in buildFHSUserEnv rec { xorg.libSM xorg.libICE gnome2.GConf - (curl.override { gnutlsSupport = true; opensslSupport = false; }) + curlWithGnuTls nspr nss cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665d0bdc23..725bdb3e5e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4972,6 +4972,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 { }; @@ -29588,11 +29590,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 { }; |