Merge pull request #164602 from bobby285271/pantheon

pkgs/pantheon: tries to pick up themes correctly
2024-09-30 17:49:58 +03:00 · 2022-03-19 20:43:59 +08:00 · 2022-03-19 20:43:59 +08:00 · b11dd31e74
commit b11dd31e74
parent b424115d7f 536f5450b0
21 changed files with 8 additions and 42 deletions
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@ -5,7 +5,6 @@
 , appstream-glib
 , dbus
 , desktop-file-utils
-, elementary-icon-theme
 , fetchFromGitHub
 , fetchpatch
 , flatpak
@ -65,7 +64,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    appstream
-    elementary-icon-theme
    flatpak
    glib
    granite
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@ -13,7 +13,6 @@
 , granite
 , libgee
 , libhandy
-, elementary-icon-theme
 , appstream
 , wrapGAppsHook
 }:
@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    granite
    gtk3
    libgee
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@ -11,7 +11,6 @@
 , vala
 , wrapGAppsHook
 , clutter
-, elementary-icon-theme
 , evolution-data-server
 , folks
 , geoclue2
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    clutter
-    elementary-icon-theme
    evolution-data-server
    folks
    geoclue2
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@ -13,7 +13,6 @@
 , python3
 , vala
 , wrapGAppsHook
-, elementary-icon-theme
 , glib
 , granite
 , gst_all_1
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    glib
    granite
    gtk3
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@ -13,7 +13,6 @@
 , vala
 , wrapGAppsHook
 , editorconfig-core-c
-, elementary-icon-theme
 , granite
 , gtk3
 , gtksourceview4
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    editorconfig-core-c
-    elementary-icon-theme
    granite
    gtk3
    gtksourceview4
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@ -13,7 +13,6 @@
 , granite
 , libgee
 , libhandy
-, elementary-icon-theme
 , gettext
 , wrapGAppsHook
 , appstream
@ -51,7 +50,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    appstream
-    elementary-icon-theme
    granite
    gtk3
    libgee
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@ -22,7 +22,6 @@
 , sqlite
 , zeitgeist
 , glib-networking
-, elementary-icon-theme
 , libcloudproviders
 , libgit2-glib
 , wrapGAppsHook
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    bamf
    elementary-dock
-    elementary-icon-theme
    glib
    granite
    gtk3
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@ -17,7 +17,6 @@
 , libgdata
 , sqlite
 , granite
-, elementary-icon-theme
 , evolution-data-server
 , appstream
 , wrapGAppsHook
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    evolution-data-server
    folks
    granite
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@ -10,7 +10,6 @@
 , python3
 , vala
 , wrapGAppsHook
-, elementary-icon-theme
 , glib
 , granite
 , gst_all_1
@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    glib
    granite
    gtk3
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@ -28,7 +28,6 @@
 , libwebp
 , appstream
 , wrapGAppsHook
-, elementary-icon-theme
 }:

 stdenv.mkDerivation rec {
@ -63,7 +62,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    geocode-glib
    gexiv2
    granite
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@ -14,7 +14,6 @@
 , libgee
 , libhandy
 , libcanberra
-, elementary-icon-theme
 , wrapGAppsHook
 }:

@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    granite
    gtk3
    libcanberra
--- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
@ -11,7 +11,6 @@
 , vala
 , wrapGAppsHook
 , clutter-gtk
-, elementary-icon-theme
 , evolution-data-server
 , granite
 , geoclue2
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {

  buildInputs = [
    clutter-gtk
-    elementary-icon-theme
    evolution-data-server
    granite
    geoclue2
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@ -16,7 +16,6 @@
 , libnotify
 , vte
 , libgee
-, elementary-icon-theme
 , appstream
 , pcre2
 , wrapGAppsHook
@ -55,7 +54,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    granite
    gtk3
    libgee
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@ -15,7 +15,6 @@
 , clutter-gst
 , clutter-gtk
 , gst_all_1
-, elementary-icon-theme
 , wrapGAppsHook
 }:

@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    clutter-gst
    clutter-gtk
-    elementary-icon-theme
    granite
    gtk3
    libgee
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@ -2,7 +2,6 @@
 , stdenv
 , desktop-file-utils
 , nix-update-script
-, elementary-icon-theme
 , fetchFromGitHub
 , flatpak
 , gettext
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    flatpak
    glib
    granite
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@ -13,7 +13,6 @@
 , libhandy
 , granite
 , gettext
-, elementary-icon-theme
 , wrapGAppsHook
 }:

@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    elementary-icon-theme
    granite
    gtk3
    libgee
--- 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"
    )
  '';

--- 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
--- 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
--- 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
--- 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"
    )
  '';