pyrox.dev
Merge pull request #247865 from bobby285271/upd/cinnamon
gthumb, cinnamon.pix: Fix build with exiv2 0.28
authored by
Bobby Rong
and committed by
GitHub
9e394177
9472508c
+7
pkgs/applications/graphics/gthumb/default.nix
+7
pkgs/applications/graphics/gthumb/default.nix
···
49
49
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
50
50
sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
51
51
})
52
+
53
+
# Fix build with exiv2 0.28, can be removed on next update
54
+
# https://gitlab.gnome.org/GNOME/gthumb/-/issues/282
55
+
(fetchpatch {
56
+
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch";
57
+
sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o=";
58
+
})
52
59
];
53
60
54
61
nativeBuildInputs = [
+10
-1
pkgs/desktops/cinnamon/pix/default.nix
+10
-1
pkgs/desktops/cinnamon/pix/default.nix
···
1
1
{ stdenv
2
2
, lib
3
-
, fetchurl
4
3
, fetchFromGitHub
4
+
, fetchpatch
5
5
, pkg-config
6
6
, meson
7
7
, ninja
···
42
42
rev = version;
43
43
sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0=";
44
44
};
45
+
46
+
patches = [
47
+
# Fix build with exiv2 0.28, can be removed on next update
48
+
# https://github.com/linuxmint/pix/pull/178
49
+
(fetchpatch {
50
+
url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch";
51
+
sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4=";
52
+
})
53
+
];
45
54
46
55
nativeBuildInputs = [
47
56
bison