diff options
Diffstat (limited to 'pkgs/desktops/budgie')
8 files changed, 19 insertions, 44 deletions
diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index 230e4fd97e989..f46a330247d6f 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "The default background set for the Budgie Desktop"; + description = "Default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; platforms = lib.platforms.linux; maintainers = lib.teams.budgie.members; diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index aea55e66256c1..1fb8d86d410e0 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -52,7 +52,7 @@ , udisks2 , upower , webp-pixbuf-loader -, wrapGAppsHook +, wrapGAppsHook3 , enableSshSocket ? false }: @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; meta = { - description = "A fork of GNOME Control Center for the Budgie 10 Series"; + description = "Fork of GNOME Control Center for the Budgie 10 Series"; homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/desktops/budgie/budgie-desktop-view/default.nix index a1869cfa918cc..d2653e775d6c3 100644 --- a/pkgs/desktops/budgie/budgie-desktop-view/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop-view/default.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "werror" false) ]; meta = { - description = "The official Budgie desktop icons application/implementation"; + description = "Official Budgie desktop icons application/implementation"; homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop-view"; mainProgram = "org.buddiesofbudgie.budgie-desktop-view"; license = lib.licenses.asl20; 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; diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix index d853a584a7a40..a9f4274508836 100644 --- a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix +++ b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix @@ -31,9 +31,6 @@ let document-font-name="Noto Sans 10" monospace-font-name="Hack 10" - [org.gnome.desktop.peripherals.touchpad:Budgie] - tap-to-click=true - [org.gnome.desktop.wm.preferences:Budgie] titlebar-font="Noto Sans Bold 10" diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index 68c253a2a1c67..55b4be851642c 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -13,7 +13,7 @@ , ninja , pkg-config , systemd -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; meta = { - description = "A fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; + description = "Fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; platforms = lib.platforms.linux; diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index f900e82a9ce10..5f42b1986ce69 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -35,7 +35,7 @@ , meson , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gi-docgen , sysprof , libsysprof-capture @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { xvfb-run pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 gi-docgen xorgserver ]; |