diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon')
23 files changed, 17 insertions, 52 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 93c10d072928..bfbfb6d53d3d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2356d362f6b6..703913998a45 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 70b092d3f2c3..f3bd37b00e06 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 94bbc69047dd..31dfa369818f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4087168feb06..f1cd335459e7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 6d9fe808d8d3..f589f4234ca5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4314e74d5af8..9147324b8867 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 4a003d6c5abc..e56f85005de7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 843830427761..f43234faa405 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index e5a8523014db..48cfda3df76d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 7629da0f734f..48a68860dd94 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index f220db8868de..c101e57e1ace 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index e796a2a344a9..fe6e5a40fa4d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index cb1ea291225b..d4c03a076579 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix index 6069fb854781..11ce2048ae41 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix index 209fa1202f3b..ee43903a00a1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/nixpkgs/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 diff --git a/nixpkgs/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix index 29192a4dd80a..a3d5f873cbcb 100644 --- a/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -83,10 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; { epiphany = pkgs.epiphany.override { withPantheon = true; }; - evince = pkgs.evince.override { withPantheon = true; }; - - file-roller = pkgs.gnome.file-roller.override { withPantheon = true; }; - sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -109,9 +105,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (gnome) file-roller; }; - gala = callPackage ./desktop/gala { - inherit (gnome) gnome-desktop; - }; + gala = callPackage ./desktop/gala { }; gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { inherit (gnome) gnome-bluetooth; @@ -199,9 +193,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; - switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome) gnome-desktop; - }; + switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; @@ -246,8 +238,12 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 + evince = pkgs.gnome.evince; # added 2022-03-18 + extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 + file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 45a8f119ee05..06fbfdc078e2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 3355ee09299f..fa4ff7edf12e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 1d4a1cb74146..3cf7cd365f16 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index 5a5af9ca5b98..75447adf4a26 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix index e1a25eea4a63..190514392098 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix @@ -49,5 +49,8 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.pantheon.members; platforms = platforms.linux; + # sendto device selection is removed in gnome-bluetooth 42 + # https://github.com/elementary/gnome-bluetooth-contract/issues/1 + broken = true; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 2e3f51b4a6a6..b996fdfdd6e5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/nixpkgs/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" ) ''; |