diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-08-08 15:38:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 15:38:23 +0800 |
| commit | 9e3941778f8fcd55fc4c2e52bc4ebf1da1594419 (patch) | |
| tree | 87fc595d554f3137dbc41949535b72067f494e08 /pkgs/desktops/cinnamon | |
| parent | 9472508c4f6c1b8e54b3541d2095be63d5bda6b9 (diff) | |
| parent | e7f74b92dd181c90622d130c83f8dbea4bdc3896 (diff) | |
| download | nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar.gz nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar.bz2 nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar.lz nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar.xz nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.tar.zst nixlib-9e3941778f8fcd55fc4c2e52bc4ebf1da1594419.zip | |
Merge pull request #247865 from bobby285271/upd/cinnamon
gthumb, cinnamon.pix: Fix build with exiv2 0.28
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/pix/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 10e6c4e96bf2..ef434171d914 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -1,7 +1,7 @@ { 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 |