From 2cea4367b1b13ef039ecb6a37e86d54fc4b31cc5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 18 Sep 2023 13:49:07 +0000 Subject: [PATCH] =?UTF-8?q?snapshot:=2045.beta=20=E2=86=92=2045.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/snapshot/-/compare/45.beta...45.0 Cargo.toml and meson.build change looks okay. Most changes came from running `cargo fmt`. Branding changed to Camera. Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- pkgs/applications/graphics/snapshot/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index 943dda293813..a47016e379da 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , cargo , desktop-file-utils , meson @@ -18,13 +19,22 @@ stdenv.mkDerivation rec { pname = "snapshot"; - version = "45.beta"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz"; - hash = "sha256-Dxi06QoLHxL5pqFh3zGBZ/n8zoxW7iWW+QNs21qfRvg="; + hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c="; }; + patches = [ + # Fix portal requests + # https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch"; + hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok="; + }) + ]; + nativeBuildInputs = [ cargo desktop-file-utils