Merge pull request #276813 from jtojnar/libsoup-no-propagate
libsoup: Remove passthru.propagatedUserEnvPackages
This commit is contained in:
commit
9b6e63979f
3 changed files with 4 additions and 9 deletions
|
@ -7,6 +7,7 @@
|
||||||
, geoip
|
, geoip
|
||||||
, gettext
|
, gettext
|
||||||
, glib
|
, glib
|
||||||
|
, glib-networking
|
||||||
, gtk3
|
, gtk3
|
||||||
, json-glib
|
, json-glib
|
||||||
, libappindicator
|
, libappindicator
|
||||||
|
@ -50,7 +51,9 @@ stdenv.mkDerivation rec {
|
||||||
libmrss
|
libmrss
|
||||||
libproxy
|
libproxy
|
||||||
libsoup_3
|
libsoup_3
|
||||||
] ++ libsoup_3.propagatedUserEnvPackages;
|
# For TLS support.
|
||||||
|
glib-networking
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = false; # Requires network access
|
doCheck = false; # Requires network access
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
, gnome
|
, gnome
|
||||||
, libsysprof-capture
|
, libsysprof-capture
|
||||||
, sqlite
|
, sqlite
|
||||||
, glib-networking
|
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
|
@ -93,9 +92,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
propagatedUserEnvPackages = [
|
|
||||||
glib-networking.out
|
|
||||||
];
|
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
attrPath = "libsoup_3";
|
attrPath = "libsoup_3";
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
, brotli
|
, brotli
|
||||||
, gnomeSupport ? true
|
, gnomeSupport ? true
|
||||||
, sqlite
|
, sqlite
|
||||||
, glib-networking
|
|
||||||
, buildPackages
|
, buildPackages
|
||||||
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||||
}:
|
}:
|
||||||
|
@ -85,9 +84,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
propagatedUserEnvPackages = [
|
|
||||||
glib-networking.out
|
|
||||||
];
|
|
||||||
updateScript = gnome.updateScript {
|
updateScript = gnome.updateScript {
|
||||||
packageName = pname;
|
packageName = pname;
|
||||||
versionPolicy = "odd-unstable";
|
versionPolicy = "odd-unstable";
|
||||||
|
|
Loading…
Reference in a new issue