diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/budgie/budgie-desktop/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/budgie/budgie-desktop/plugins.patch | 154 | ||||
-rw-r--r-- | pkgs/desktops/budgie/budgie-desktop/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/deepin/apps/deepin-editor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/deepin/apps/deepin-terminal/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/apps/ghex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/gnome/extensions/impatience/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/gnome/misc/geary/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix | 29 | ||||
-rw-r--r-- | pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 18 |
12 files changed, 181 insertions, 82 deletions
diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index df6ba5d277975..43a68e54beed9 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , accountsservice , alsa-lib , budgie-screensaver @@ -38,31 +37,17 @@ stdenv.mkDerivation rec { pname = "budgie-desktop"; - version = "10.7.2"; + version = "10.8"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps="; + hash = "sha256-fOsTBnKtwBGQSPkBBrzwHEB3+OcJYtPIdvZsV31oi6g="; }; patches = [ - # Drop all Vapi files that are already included with Vala - # https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2.patch"; - hash = "sha256-Cyj/+G1dx0DKCTtzVESzFZ+I5o7INopGvw7bq5o/abo="; - }) - - # Add support for Magpie - # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/387 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/84ccb505160322536043717c3b8f970ab91b0103.patch"; - hash = "sha256-4nd7Tk4ajyVy8cGDNIINpW9jlyRNywPYMrhBCtJVHZk="; - }) - ./plugins.patch ]; @@ -117,6 +102,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; platforms = platforms.linux; maintainers = [ maintainers.federicoschonborn ]; - license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30]; + license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; }; } diff --git a/pkgs/desktops/budgie/budgie-desktop/plugins.patch b/pkgs/desktops/budgie/budgie-desktop/plugins.patch index af03fb6351403..ca23edc42ceea 100644 --- a/pkgs/desktops/budgie/budgie-desktop/plugins.patch +++ b/pkgs/desktops/budgie/budgie-desktop/plugins.patch @@ -1,21 +1,153 @@ +diff --git a/meson.build b/meson.build +index 48aeeb38..31e4c24b 100644 +--- a/meson.build ++++ b/meson.build +@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir')) + localedir = join_paths(prefix, get_option('localedir')) + podir = join_paths(meson.source_root(), 'po') + +-cdata.set_quoted('DATADIR', datadir) +-cdata.set_quoted('SYSCONFDIR', confdir) +-cdata.set_quoted('LOCALEDIR', localedir) +-cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org') +- + # Handle i18n on the .desktop file + # Originally stolem from TingPing: + # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build +@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir) + cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir) + cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir) + cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir) +- +-if prefix == '/usr' or prefix == '/usr/local' +- cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true) +- +- if prefix == '/usr' +- secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name()) +- secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name()) +- else +- secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name()) +- secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name()) +- endif +- +- cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins')) +- cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins')) +- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins')) +- cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins')) +-endif ++cdata.set_quoted('DATADIR', datadir) ++cdata.set_quoted('SYSCONFDIR', confdir) ++cdata.set_quoted('LOCALEDIR', localedir) ++cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org') + + with_bluetooth = get_option('with-bluetooth') + if with_bluetooth == true +diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c +index fc531f59..0a21b690 100644 +--- a/src/config/budgie-config.c ++++ b/src/config/budgie-config.c +@@ -11,7 +11,6 @@ + + #ifndef CONFIG_H_INCLUDED + #include "config.h" +-#include <stdbool.h> + + /** + * All this is to keep Vala happy & configured.. +@@ -20,21 +19,6 @@ const char* BUDGIE_MODULE_DIRECTORY = MODULEDIR; + const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR; + const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR; + const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR; +- +-#ifdef HAS_SECONDARY_PLUGIN_DIRS +-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true; +-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY; +-const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY; +-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY; +-const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY; +-#else +-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false; +-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL; +-const char* BUDGIE_MODULE_DATA_DIRECTORY = NULL; +-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = NULL; +-const char* BUDGIE_RAVEN_PLUGIN_DATADIR = NULL; +-#endif +- + const char* BUDGIE_DATADIR = DATADIR; + const char* BUDGIE_VERSION = PACKAGE_VERSION; + const char* BUDGIE_WEBSITE = PACKAGE_URL; +diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h +index 720379a5..c5774820 100644 +--- a/src/config/budgie-config.h ++++ b/src/config/budgie-config.h +@@ -12,8 +12,6 @@ + #ifndef _BUDGIE_CONFIG_H_ + #define _BUDGIE_CONFIG_H_ + +-#include <stdbool.h> +- + /* i.e. /usr/lib/budgie-desktop */ + extern const char* BUDGIE_MODULE_DIRECTORY; + +@@ -26,12 +24,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR; + /* i.e. /usr/share/budgie-desktop/raven-plugins */ + extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR; + +-extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS; +-extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY; +-extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY; +-extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY; +-extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY; +- + /* i.e. /usr/share/ */ + extern const char* BUDGIE_DATADIR; + +diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi +index 5eb445d1..7d27e348 100644 +--- a/src/config/budgie-config.vapi ++++ b/src/config/budgie-config.vapi +@@ -22,21 +22,6 @@ namespace Budgie { + [CCode (cheader_filename="budgie-config.h")] + public extern const string RAVEN_PLUGIN_DATADIR; + +- [CCode (cheader_filename="budgie-config.h")] +- public extern const bool HAS_SECONDARY_PLUGIN_DIRS; +- +- [CCode (cheader_filename="budgie-config.h")] +- public extern const string? MODULE_DIRECTORY_SECONDARY; +- +- [CCode (cheader_filename="budgie-config.h")] +- public extern const string? MODULE_DATA_DIRECTORY_SECONDARY; +- +- [CCode (cheader_filename="budgie-config.h")] +- public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY; +- +- [CCode (cheader_filename="budgie-config.h")] +- public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY; +- + [CCode (cheader_filename="budgie-config.h")] + public extern const string DATADIR; + diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala -index d3cdb65c..9d569bd1 100644 +index f4f2e4da..9d569bd1 100644 --- a/src/panel/plugin_manager.vala +++ b/src/panel/plugin_manager.vala -@@ -40,10 +40,26 @@ namespace Budgie { +@@ -40,13 +40,26 @@ namespace Budgie { } /* System path */ - var dir = Environment.get_user_data_dir(); - engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY); +- if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) { +- engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY); + var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR"); + if (libdir != null) { + debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir); + } else { + debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); + libdir = Budgie.MODULE_DIRECTORY; -+ } -+ + } + + var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); + if (datadir != null) { + debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); @@ -25,22 +157,24 @@ index d3cdb65c..9d569bd1 100644 + } + + engine.add_search_path(libdir, datadir); - ++ /* User path */ + var dir = Environment.get_user_data_dir(); var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins"); var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); engine.add_search_path(user_mod, hdata); diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala -index b0814693..d671109a 100644 +index 01f32553..d671109a 100644 --- a/src/raven/plugin_manager.vala +++ b/src/raven/plugin_manager.vala -@@ -51,10 +51,26 @@ namespace Budgie { +@@ -51,13 +51,26 @@ namespace Budgie { } /* System path */ - var dir = Environment.get_user_data_dir(); - engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR); +- if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) { +- engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY); + var libdir = Environment.get_variable("RAVEN_PLUGIN_LIBDIR"); + if (libdir != null) { + debug("RAVEN_PLUGIN_LIBDIR is set to %s", libdir); @@ -55,10 +189,10 @@ index b0814693..d671109a 100644 + } else { + debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR); + datadir = Budgie.RAVEN_PLUGIN_DATADIR; -+ } -+ -+ engine.add_search_path(libdir, datadir); + } ++ engine.add_search_path(libdir, datadir); ++ /* User path */ + var dir = Environment.get_user_data_dir(); var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins"); diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix index 88c8d132bf12d..99b33b68cb0ec 100644 --- a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix +++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix @@ -4,7 +4,7 @@ , xorg , wrapGAppsHook , budgie-desktop -, plugins ? [] +, plugins ? [ ] }: stdenv.mkDerivation { diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 58bfb22bce29a..299319a0687ab 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.10"; + version = "6.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-NevylvfeoT69i1AFJTypSfJKEd38uSXwGm9doRrZ2TI="; + hash = "sha256-OdKEskxrzFo4VOsR2+rsH3G63uqMmsBuXufayHWSQac="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 5caa37bfeadd7..1aa9ffdf0855f 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-pRTdvR3hyiJVpi38Ex58X74ns+rSWuytsOXemvdW1Rk="; + hash = "sha256-LzCbh+BErgh7Ojbw314oHB8QvyS6UeJkDUkNngzVm+A="; }; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 36aad3edaac35..d0d032b6ec3c7 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "44.1"; + version = "44.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI="; + sha256 = "6+y0xoo30zk3uewmPIV23x2MaascHT4S1WaP0gB+kws="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 6eddefc7c4526..0e88bb20914e1 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.5"; + version = "42.6"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "pPXxrC27e3uS99bStCwDD2Ku2bVCa53BFpRgQfPLqPc="; + sha256 = "WGT+bx5xhxXbJrYiAbdaWQIM9CR/7DdkWzVZzS26WdA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 559b5edf0a3f1..5d56d67568550 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-shell-extension-impatience"; - version = "unstable-2022-03-26"; + version = "unstable-2023-04-04"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = "cf7c0bb8776af9a16e4ae114df0cc65869fb669d"; - sha256 = "sha256-z/pZxSEFELtg7kueS2i6gN1+VbN0m4mxc34pOCMak5g="; + rev = "0f961b860040ba0f7bbb51ebbaece7db29787313"; + hash = "sha256-c15zZC9xc0nq8NdnP0gjayMmnD8GyHFV8oZaD4LyR7w="; }; buildInputs = [ diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index 1a6189e6c3ef4..3a89f83cb697c 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0="; + sha256 = "fRHLbhxQThCMLckaoiVqRATcq+fRyHPY1glOLfM1onc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index e3fd576a14e0c..9b832ccde44a3 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -11,37 +10,19 @@ , dbus , polkit , accountsservice -, python3 }: stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "7.0.2"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "default-settings"; rev = version; - sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; + sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU="; }; - patches = [ - # Don't set picture-uri-dark. elementary-gsettings-schemas won't - # aware of our custom remove-backgrounds.gschema.override so it - # will be a confusing invalid value otherwise (though gala actually - # can handle it well). - # https://github.com/elementary/default-settings/pull/282 - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; - sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; - }) - # https://github.com/elementary/default-settings/pull/283 - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; - sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; - }) - ]; - nativeBuildInputs = [ accountsservice dbus @@ -50,7 +31,6 @@ stdenv.mkDerivation rec { ninja pkg-config polkit - python3 ]; mesonFlags = [ @@ -59,11 +39,6 @@ stdenv.mkDerivation rec { "-Dplank-dockitems=false" ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preInstall = '' # Install our override for plank dockitems as the desktop file path is different. schema_dir=$out/share/glib-2.0/schemas diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix index fd119592ba436..791c8ecbde523 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix @@ -1,4 +1,5 @@ { mkXfceDerivation +, gobject-introspection , dbus-glib , garcon , glib @@ -11,11 +12,16 @@ , libxfce4util , libxklavier , pam +, python3 , systemd , xfconf , lib }: +let + # For xfce4-screensaver-configure + pythonEnv = python3.withPackages (pp: [ pp.pygobject3 ]); +in mkXfceDerivation { category = "apps"; pname = "xfce4-screensaver"; @@ -23,6 +29,10 @@ mkXfceDerivation { sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs="; + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ dbus-glib garcon @@ -36,6 +46,7 @@ mkXfceDerivation { libxfce4util libxklavier pam + pythonEnv systemd xfconf ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 5dc21338a72cb..4aec72ea334b2 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -2,19 +2,12 @@ , lib , pkgs , generateSplicesForMkScope -, makeScopeWithSplicing +, makeScopeWithSplicing' }: -let - keep = _self: { }; - extra = _spliced0: { }; - -in -makeScopeWithSplicing - (generateSplicesForMkScope "xfce") - keep - extra - (self: +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "xfce"; + f = (self: let inherit (self) callPackage; in @@ -177,4 +170,5 @@ makeScopeWithSplicing thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 - }) + }); +} |