colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #298673 from bobby285271/upd/budgie 

budgie.budgie-desktop: Use libxfce4windowing 4.19.3
This commit is contained in:
Bobby Rong 2024-03-25 20:46:37 +08:00 committed by GitHub
parent 60a3c785bd 4c9331d517
commit c726225724
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/desktops/budgie/budgie-desktop/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, accountsservice
, alsa-lib
, budgie-screensaver
@ -49,6 +50,27 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./plugins.patch
# Fix workspace applet window icon click not performing workspace switch
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/524
(fetchpatch2 {
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/9b775d613ad0c324db628ed5a32d3fccc90f82d6.patch";
hash = "sha256-QtPviPW7pJYZIs28CYwE3N8vcDswqnjD6d0WVPFchL4=";
})
# Work around even more SNI noncompliance
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/539
(fetchpatch2 {
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/84269e2fcdcac6d737ee5100881e8b306eaae570.patch";
hash = "sha256-1Uj+6GZ9/oDQOt+5P8UYiVP3P0BrsJe3HqXVLkWCkAM=";
})
# vapi: Update libxfce4windowing to 4.19.3
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/546
(fetchpatch2 {
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/a040ccb96094f1d3a1ee81a6733c9434722bdf6c.patch";
hash = "sha256-9eMYB5Zyn3BDYvAwORXTHaPGYDP7LnqHAwp+6Wy6XLk=";
})
];
nativeBuildInputs = [

31
pkgs/desktops/xfce/core/libxfce4windowing/default.nix
View File

@ -1,14 +1,35 @@
{ lib, mkXfceDerivation, gobject-introspection, glib, gtk3, libwnck, wayland }:
{ lib
, mkXfceDerivation
, gobject-introspection
, wayland-scanner
, glib
, gtk3
, libwnck
, libX11
, wayland
, wlr-protocols
}:
mkXfceDerivation {
category = "xfce";
pname = "libxfce4windowing";
version = "4.19.2";
version = "4.19.3";
sha256 = "sha256-mXxxyfwZB/AJFVVGFAAXLqC5p7pZAeqmhljQym55hyM=";
sha256 = "sha256-nsobRyGeagUq1WHzYBq6vd9g5A65KEQC4cX+m7w0pqg=";
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ glib gtk3 libwnck wayland ];
nativeBuildInputs = [
gobject-introspection
wayland-scanner
];
buildInputs = [
glib
gtk3
libwnck
libX11
wayland
wlr-protocols
];
meta = {
description = "Windowing concept abstraction library for X11 and Wayland";