budgie-desktop: 10.9.3-unstable-2025-09-13 -> 10.9.4 (#460083)

This commit is contained in:
Vladimír Čunát
2025-11-11 08:05:11 +00:00
committed by GitHub
6 changed files with 32 additions and 22 deletions
+1 -1
View File
@@ -170,7 +170,7 @@
- `meilisearch_1_11` has been removed, as it is no longer supported.
- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`.
- `budgie-desktop` has been updated [10.9.4](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.4). This changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie` and contains ABI bumps for libpeas2 migration.
- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
@@ -8,6 +8,7 @@
vala,
budgie-desktop,
gtk3,
gtk-layer-shell,
libpeas2,
nix-update-script,
}:
@@ -33,15 +34,22 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
budgie-desktop
gtk3
gtk-layer-shell
libpeas2
];
postPatch = ''
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
substituteInPlace meson.build \
--replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')"
# https://github.com/samlane-ma/analogue-clock-applet/issues/7
substituteInPlace budgie-analogue-clock-widget/src/meson.build \
--replace-fail "dependency('budgie-raven-plugin-1.0')" "dependency('budgie-raven-plugin-2.0')"
'';
mesonFlags = [
# The meson option actually enables libpeas2 support
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
"-Dfor-wayland=true"
];
passthru = {
updateScript = nix-update-script { };
};
+5 -5
View File
@@ -48,14 +48,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-desktop";
version = "10.9.3-unstable-2025-09-13";
version = "10.9.4";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-desktop";
rev = "68d5136613fa1b15d39cc67ada3085590ec162ae";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs=";
hash = "sha256-e1kkmzSYX8TwiY0IIZYIK/FgMbZ/8PqkUn8pk3CcXHU=";
};
outputs = [
@@ -147,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: {
teams = [ lib.teams.budgie ];
platforms = lib.platforms.linux;
pkgConfigModules = [
"budgie-1.0"
"budgie-raven-plugin-1.0"
"budgie-2.0"
"budgie-raven-plugin-2.0"
"budgie-theme-1.0"
];
};
@@ -43,12 +43,18 @@ stdenv.mkDerivation (finalAttrs: {
requests
];
mesonFlags = [
# The meson option actually enables libpeas2 support
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
"-Dfor-wayland=true"
];
postPatch = ''
substituteInPlace meson.build --replace-fail "/usr" "$out"
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
substituteInPlace budgie-media-player-applet.plugin.in \
--replace-fail "Loader=@PYTHON@" "Loader=python"
# https://github.com/zalesyc/budgie-media-player-applet/issues/25
substituteInPlace src/{applet,testWin,Popover,BudgieMediaPlayer}.py \
--replace-fail "gi.require_version('Budgie', '1.0')" "gi.require_version('Budgie', '2.0')"
'';
postFixup = ''
@@ -50,8 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
# https://github.com/prateekmedia/budgie-systemmonitor-applet/issues/4
substituteInPlace meson.build \
--replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')"
--replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" \
--replace-fail "dependency('budgie-1.0', version: '>= 2')" "dependency('budgie-2.0')"
'';
passthru = {
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-user-indicator-redux";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "EbonJaeger";
repo = "budgie-user-indicator-redux";
rev = "v${finalAttrs.version}";
hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4=";
tag = "v${finalAttrs.version}";
hash = "sha256-ZvT114F0g+3zpskyb4Bn6grAXHWtMqRqb9MzfF0WLQ8=";
};
nativeBuildInputs = [
@@ -44,12 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
sassc
];
postPatch = ''
# https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
substituteInPlace meson.build \
--replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')"
'';
passthru = {
updateScript = nix-update-script { };
};