diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-25 03:04:44 +0000 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-03-16 21:37:02 +0800 |
| commit | a5c58fae723d7a134953f6f3bc2d08b2c5be7f23 (patch) | |
| tree | d805887bb98f3f5d1cd83624cf03ba473eb341b7 /pkgs/applications/graphics/shotwell/default.nix | |
| parent | 95cb05fe7fb455e89ad3cfab1c18b0648910b283 (diff) | |
| download | nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar.gz nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar.bz2 nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar.lz nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar.xz nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.tar.zst nixpkgs-a5c58fae723d7a134953f6f3bc2d08b2c5be7f23.zip | |
shotwell: 0.31.5 → 0.31.7
https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.31.5...shotwell-0.31.7 Co-authored-by: Bobby Rong <rjl931189261@126.com> Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/applications/graphics/shotwell/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a566d9da788..623a8d783f7 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, fetchpatch2 , meson , ninja , gtk3 @@ -31,6 +33,7 @@ , gobject-introspection , itstool , libsecret +, libportal-gtk3 , gsettings-desktop-schemas , python3 }: @@ -39,13 +42,22 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.5"; + version = "0.31.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; + sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA="; }; + patches = [ + # Fix build with vala 0.56.4, can be removed on next update + # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch"; + hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -86,6 +98,7 @@ stdenv.mkDerivation rec { gcr gnome.adwaita-icon-theme libsecret + libportal-gtk3 ]; postPatch = '' |