diff options
Diffstat (limited to 'pkgs/desktops')
26 files changed, 23 insertions, 45 deletions
diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index a2e4f717f48..7b3ffe2f112 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, nixosTests }: stdenv.mkDerivation rec { pname = "terminology"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patchShebangs data/colorschemes/*.py ''; + passthru.tests.test = nixosTests.terminal-emulators.terminology; + meta = with lib; { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 69fb69261f9..588d6e3ced3 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -23,6 +23,7 @@ , pcre2 , libxslt , docbook-xsl-nons +, nixosTests }: stdenv.mkDerivation rec { @@ -82,6 +83,8 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal; + meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index e93e404762a..9412506385b 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , lxqtUpdateScript +, nixosTests }: mkDerivation rec { @@ -35,6 +36,8 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.tests.test = nixosTests.terminal-emulators.qterminal; + meta = with lib; { homepage = "https://github.com/lxqt/qterminal"; description = "A lightweight Qt-based terminal emulator"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 19fa5697f96..fcae87a869e 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.tests.test = nixosTests.terminal-emulators.mate-terminal; + meta = with lib; { description = "MATE desktop terminal emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 93c10d07292..bfbfb6d53d3 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2356d362f6b..703913998a4 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 70b092d3f2c..f3bd37b00e0 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 94bbc69047d..31dfa369818 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4087168feb0..f1cd335459e 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 6d9fe808d8d..f589f4234ca 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4314e74d5af..9147324b886 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 4a003d6c5ab..e56f85005de 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 84383042776..f43234faa40 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index e5a8523014d..48cfda3df76 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 7629da0f734..48a68860dd9 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index f220db8868d..c101e57e1ac 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index e796a2a344a..fe6e5a40fa4 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index cb1ea291225..d4c03a07657 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 6069fb85478..11ce2048ae4 100644 --- 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 diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 209fa1202f3..ee43903a00a 100644 --- 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 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" ) ''; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 4d887f96ffd..65611f73a1d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }: mkXfceDerivation { category = "apps"; @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; + meta = with lib; { description = "A modern terminal emulator"; maintainers = with maintainers; [ ] ++ teams.xfce.members; |