mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 01:33:20 +00:00
Merge pull request #259382 from bobby285271/upd/xfce
Xfce updates 2023-10-06
This commit is contained in:
commit
806415e367
@ -1,30 +1,34 @@
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, exo
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, xfconf
|
||||
, libwnck
|
||||
, libX11
|
||||
, libXmu
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "xfce4-taskmanager";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA=";
|
||||
sha256 = "sha256-2NkjaK6xXsrMimriO2/gTOZowt9KTX4MrWJpPXM0w68=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
exo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxfce4ui
|
||||
xfconf
|
||||
libwnck
|
||||
libX11
|
||||
libXmu
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ mkXfceDerivation
|
||||
, fetchpatch
|
||||
, lib
|
||||
, docbook_xsl
|
||||
, exo
|
||||
@ -25,6 +26,15 @@ let unwrapped = mkXfceDerivation {
|
||||
|
||||
sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU=";
|
||||
|
||||
patches = [
|
||||
# Fix log spam with new GLib
|
||||
# https://gitlab.xfce.org/xfce/thunar/-/issues/1204
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.xfce.org/xfce/thunar/-/commit/2f06fcdbedbc59d9f90ccd3df07fce417cea391d.patch";
|
||||
sha256 = "sha256-nvYakT4GJkQYmubgZF8GJIA/m7+6ZPbmD0HSgMcCh10=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
gobject-introspection
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, fetchpatch
|
||||
, polkit
|
||||
, exo
|
||||
, libxfce4util
|
||||
@ -19,6 +20,15 @@ mkXfceDerivation {
|
||||
|
||||
sha256 = "sha256-qCkE3aVYVwphoO1ZAyzpL1ZtsLaP6XT1H1rlFoBI3yg=";
|
||||
|
||||
patches = [
|
||||
# Add minimal xdg-desktop-portal conf file
|
||||
# https://gitlab.xfce.org/xfce/xfce4-session/-/issues/181
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/6451c8b21085631d8861e07ff4e1b2ef64a64ad3.patch";
|
||||
sha256 = "sha256-t3opom0iv7QsKoivzk+nXbxI5uFhNmB8/Qwb4QHvcCQ=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
exo
|
||||
gtk3
|
||||
|
@ -17,8 +17,8 @@
|
||||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-pulseaudio-plugin";
|
||||
version = "0.4.7";
|
||||
sha256 = "sha256-9fumaX4M6NTXHM1gGa4wB/Uq+CZIUnvm9kC+pJNbWXU=";
|
||||
version = "0.4.8";
|
||||
sha256 = "sha256-7vcjARm0O+/hVNFzOpxcgAnqD+wRNg5/eqXLcq4t/iU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
automakeAddFlags
|
||||
|
Loading…
Reference in New Issue
Block a user