3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #171043 from prusnak/curlWithGnuTls

treewide: refactor curlWithGnuTls into all-packages.nix
This commit is contained in:
Pavol Rusnak 2022-05-25 17:18:07 +02:00 committed by GitHub
commit ef50f067f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 23 deletions

View file

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

View file

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

View file

@ -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.5.0";

View file

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

View file

@ -108,7 +108,7 @@ rec {
xorg.libICE
gnome2.GConf
freetype
(curl.override { gnutlsSupport = true; opensslSupport = false; })
curlWithGnuTls
nspr
nss
fontconfig

View file

@ -155,7 +155,7 @@ in buildFHSUserEnv rec {
xorg.libSM
xorg.libICE
gnome2.GConf
(curl.override { gnutlsSupport = true; opensslSupport = false; })
curlWithGnuTls
nspr
nss
cups

View file

@ -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 { };