cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #247865 from bobby285271/upd/cinnamon

Browse source 
gthumb, cinnamon.pix: Fix build with exiv2 0.28
This commit is contained in:
Bobby Rong 2023-08-08 15:38:23 +08:00 committed by GitHub
commit 9e3941778f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/graphics/gthumb/default.nix
View file

@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
}) })
# Fix build with exiv2 0.28, can be removed on next update
# https://gitlab.gnome.org/GNOME/gthumb/-/issues/282
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch";
sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

11
pkgs/desktops/cinnamon/pix/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchurl
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, meson , meson
, ninja , ninja
@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0="; sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0=";
}; };
patches = [
# Fix build with exiv2 0.28, can be removed on next update
# https://github.com/linuxmint/pix/pull/178
(fetchpatch {
url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch";
sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
bison bison
desktop-file-utils desktop-file-utils