From 8b468ac52e55560e8581a4b93ddefba00dbfab62 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 19 Dec 2019 13:31:58 +0100 Subject: [PATCH 2/2] gnu: Depropagate glib from GNOME Shell extensions * gnu/packages/gnome.scm (gnome-shell-extensions): Drop propagated inputs, move them to more appropriate place. [propagated-inputs]: Removed field. [native-inputs] : New input. [inputs] : New input. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock): Likewise. (gnome-shell-extension-hide-app-icon): Likewise. --- gnu/packages/gnome-xyz.scm | 16 ++++++++-------- gnu/packages/gnome.scm | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 148f1db646..9dff38fa39 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -140,11 +140,11 @@ the Obsidian icon theme.") (delete 'bootstrap) (delete 'configure)))) (native-inputs - `(("intltool" ,intltool) + `(("glib:bin" ,glib "bin") + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("glib" ,glib) - ("glib" ,glib "bin"))) + (inputs + `(("glib" ,glib))) (synopsis "Transforms GNOME's dash into a dock") (description "This extension moves the dash out of the overview, transforming it into a dock for easier application launching and @@ -182,12 +182,12 @@ faster window switching.") (mkdir-p (string-append (assoc-ref outputs "out") "/share/gnome-shell/extensions"))))))) (native-inputs - `(("intltool" ,intltool) + `(("glib:bin" ,glib "bin") + ("intltool" ,intltool) ("unzip" ,unzip) ("zip" ,zip))) - (propagated-inputs - `(("glib" ,glib) - ("glib" ,glib "bin"))) + (inputs + `(("glib" ,glib))) (synopsis "Hide app icon from GNOME's panel") (description "This extension allows to hide the icon and/or title of the currently focused application in the top panel of the GNOME shell.") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 77d96987d6..117937a9ba 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7537,11 +7537,11 @@ GNOME Shell appearance and extension, etc.") (arguments '(#:configure-flags '("-Dextension_set=all"))) (native-inputs - `(("intltool" ,intltool) + `(("glib" ,glib "bin") + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("glib" ,glib) - ("glib" ,glib "bin"))) + (inputs + `(("glib" ,glib))) (synopsis "Extensions for GNOME Shell") (description "GNOME Shell extensions modify and extend GNOME Shell functionality and behavior.") -- 2.24.1