diff options
Diffstat (limited to 'pkgs/desktops/budgie/budgie-desktop')
-rw-r--r-- | pkgs/desktops/budgie/budgie-desktop/default.nix | 32 | ||||
-rw-r--r-- | pkgs/desktops/budgie/budgie-desktop/wrapper.nix | 4 |
2 files changed, 7 insertions, 29 deletions
diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 50068621be34a..9e4ec9c42a2b4 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , accountsservice , alsa-lib , budgie-screensaver @@ -33,44 +32,23 @@ , upower , vala , xfce -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.1"; + version = "10.9.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-H+J/zFUjiXbr5ynDkkjrRsEbyO4LPOhqe8DdG60ikRw="; + hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo="; }; 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 = [ @@ -81,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -123,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A feature-rich, modern desktop designed to keep out the way of the user"; + description = "Feature-rich, modern desktop designed to keep out the way of the user"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop"; license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ]; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix index 99b33b68cb0ec..d25643e6603f6 100644 --- a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix +++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix @@ -2,7 +2,7 @@ , stdenv , glib , xorg -, wrapGAppsHook +, wrapGAppsHook3 , budgie-desktop , plugins ? [ ] }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = lib.forEach plugins (plugin: plugin.buildInputs) ++ plugins; |