diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 13:26:40 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 13:26:40 +0200 |
| commit | ebe133359f94af2ebf680335182a996ec464fe53 (patch) | |
| tree | 83f5da17798fdc160fd7ed226b085421c6787348 | |
| parent | d67507cacf934b970f67567bced4e044c3ca9753 (diff) | |
gnu: Unify gsettings-desktop-schemas and gsettings-desktop-schemas-next.
* gnu/packages/gnome.scm (gsettings-desktop-schemas-next): Remove variable.
(gnome-desktop)[propagated-inputs]: Use gsettings-desktop-schemas instead of
gsettings-desktop-schemas-next.
(gnome-settings-daemon)[inputs]: Likewise.
(mutter)[propagated-inputs]: Likewise.
(gnome-weather)[inputs]: Likewise.
(gnome-calculator)[inputs]: Likewise.
| -rw-r--r-- | gnu/packages/gnome.scm | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 27e8949fa1..823dff40b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2245,7 +2245,7 @@ offline sources, providing a centralized place for managing your contacts.") xorg-server-for-tests)) (propagated-inputs ;; Required by gnome-desktop-3.0.pc. - (list gsettings-desktop-schemas-next + (list gsettings-desktop-schemas gtk gtk+ iso-codes @@ -2714,21 +2714,6 @@ on the GNOME Desktop with a single simple application.") schemas for settings shared by various components of the GNOME desktop.") (license license:lgpl2.1+))) -(define-public gsettings-desktop-schemas-next - (package - (inherit gsettings-desktop-schemas) - (name "gsettings-desktop-schemas-next") ;to avoid propagation conflicts - (version "42.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6")))))) - (define-public python-liblarch (package (name "python-liblarch") @@ -5990,7 +5975,7 @@ services for numerous locations.") geoclue geocode-glib-with-libsoup2 gnome-desktop - gsettings-desktop-schemas-next + gsettings-desktop-schemas lcms libcanberra libgudev @@ -7924,7 +7909,7 @@ to display dialog boxes from the commandline and shell scripts.") python-dbusmock tini)) ;acting as init (zombie reaper) (propagated-inputs - (list gsettings-desktop-schemas-next ;required by libmutter.pc + (list gsettings-desktop-schemas ;required by libmutter.pc gtk+ ;required by libmutter.pc ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: at-spi2-core @@ -9966,7 +9951,7 @@ associations for GNOME.") bash-minimal geoclue gjs - gsettings-desktop-schemas-next + gsettings-desktop-schemas gtk libadwaita libgweather4)) @@ -10768,7 +10753,7 @@ handling the startup notification side.") python vala)) (inputs - (list gsettings-desktop-schemas-next + (list gsettings-desktop-schemas gtksourceview libadwaita libgee |