Unverified Commit 9e394177 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #247865 from bobby285271/upd/cinnamon 

gthumb, cinnamon.pix: Fix build with exiv2 0.28
parents 9472508c e7f74b92

pkgs/applications/graphics/gthumb/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ stdenv.mkDerivation rec { 
      url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";

      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 = [

pkgs/desktops/cinnamon/pix/default.nix

+10 −1
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchurl

, fetchFromGitHub

, fetchpatch

, pkg-config

, meson

, ninja
@@ -43,6 +43,15 @@ stdenv.mkDerivation rec { 
    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 = [

    bison

    desktop-file-utils