diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-05-06 20:07:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 20:07:43 +0800 |
| commit | 174d76f7886ab93df6cd2f41b86d7d8a677be362 (patch) | |
| tree | 455347b08686b561b5a86b16d280249be0165a3b /pkgs/desktops | |
| parent | a9d1d04e11a79bd12ff795fcb84f558e86325604 (diff) | |
| parent | 81a9b5c44ae35a6263111d7a2880d0a01b096936 (diff) | |
Merge pull request #230084 from bobby285271/upd/zenity
gnome.zenity: 3.91.0 → 3.92.0
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/core/zenity/default.nix | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index b5968f92f3d77..1cf2e580c1ca7 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -15,13 +16,41 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.91.0"; + version = "3.92.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "N2GeCYAwgXj9vPaDItmaB7MzbBwLuY7ysyycsQkCI5k="; + sha256 = "bSvCP2bL2PfhlVVvDDG9ZfClx4vLGuow6XFty/qxqKk="; }; + patches = [ + # Add non-fatal deprecation warning for --attach, --icon-name, --hint + # To reduce issues like https://github.com/BuddiesOfBudgie/budgie-desktop/issues/356 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/181ca36ad4790b425f79b20be40dd25804208463.patch"; + sha256 = "Z6XOn5XnBzJSti8tD4EGezCpHmYAsIxBf7s4W3rBc9I="; + }) + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/70abb01173562dba40916c522bd20b4ba5a55904.patch"; + sha256 = "yBm7AxJiTPh2BFb+79L4WSh8xOcM6AHuvLzIEEFY80s="; + }) + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/df445feb0c0fab6865d96fb693a32fbc26503d83.patch"; + sha256 = "DTeBCsahceNZCfNziO2taXiMEdAFgm5Bx9OrlZv0LsM="; + }) + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/54bd43cbe30fbe5c9f01e42e8f3de63405770e2a.patch"; + sha256 = "tR9CKt24w7D3EA6FLu6qroS5rTkfIsaQnuY4KzgDKMY="; + }) + + # Restore the availability of running multiple instances of zenity + # https://gitlab.gnome.org/GNOME/zenity/-/issues/58 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/zenity/-/commit/cd32ad7d3fa66dccc77d96a0fd3a61bf137250f6.patch"; + sha256 = "4XCuJgXsNIiBXv4NM1JRoiqgBqyxnro0HHapkK2fM8o="; + }) + ]; + nativeBuildInputs = [ meson ninja |