cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #276813 from jtojnar/libsoup-no-propagate

Browse source 
libsoup: Remove passthru.propagatedUserEnvPackages
This commit is contained in:
7c6f434c 2024-01-01 13:26:09 +00:00 committed by GitHub
commit 9b6e63979f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
View file

@ -7,6 +7,7 @@
, geoip
, gettext
, glib
, glib-networking
, gtk3
, json-glib
, libappindicator
@ -50,7 +51,9 @@ stdenv.mkDerivation rec {
libmrss
libproxy
libsoup_3
] ++ libsoup_3.propagatedUserEnvPackages;
# For TLS support.
glib-networking
];
doCheck = false; # Requires network access

4
pkgs/development/libraries/libsoup/3.x.nix
View file

@ -8,7 +8,6 @@
, gnome
, libsysprof-capture
, sqlite
, glib-networking
, buildPackages
, gobject-introspection
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
@ -93,9 +92,6 @@ stdenv.mkDerivation rec {
'';
passthru = {
propagatedUserEnvPackages = [
glib-networking.out
];
updateScript = gnome.updateScript {
attrPath = "libsoup_3";
packageName = pname;

4
pkgs/development/libraries/libsoup/default.nix
View file

@ -14,7 +14,6 @@
, brotli
, gnomeSupport ? true
, sqlite
, glib-networking
, buildPackages
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
}:
@ -85,9 +84,6 @@ stdenv.mkDerivation rec {
'';
passthru = {
propagatedUserEnvPackages = [
glib-networking.out
];
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";