diff options
Diffstat (limited to 'pkgs/desktops/pantheon/desktop')
5 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 45a8f119ee0..06fbfdc078e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice clutter-gtk # else we get could not generate cargs for mutter-clutter-2 - elementary-gtk-theme elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -91,8 +90,11 @@ stdenv.mkDerivation rec { # for the compositor --prefix PATH : "$out/bin" - # the theme is hardcoded + # the GTK theme is hardcoded --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is hardcoded + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 3355ee09299..fa4ff7edf12 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -13,7 +13,6 @@ , glib , granite , libgee -, elementary-icon-theme , elementary-settings-daemon , gettext , libhandy @@ -56,7 +55,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme elementary-settings-daemon # settings schema glib granite diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 1d4a1cb7414..3cf7cd365f1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -14,7 +14,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , wrapGAppsHook }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 5a5af9ca5b9..75447adf4a2 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -19,7 +19,6 @@ , gnome-desktop , mutter , clutter -, elementary-icon-theme , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter - elementary-icon-theme gnome-settings-daemon gexiv2 gnome-desktop diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 2e3f51b4a6a..b996fdfdd6e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme gala granite @@ -64,8 +63,11 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - # this theme is required + # this GTK theme is required --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is required + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; |