diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-06 20:46:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 20:46:12 +0200 |
| commit | a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44 (patch) | |
| tree | cde88fcff9ad46fec8f4d4fcc1936356381410f1 /pkgs/applications/graphics | |
| parent | 272dba1e317fc8b1d3cb60f393d26c2c2e527e13 (diff) | |
| parent | d959f3cd45f4b2bb4d7c4e5488377180e7a4359c (diff) | |
| download | nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar.gz nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar.bz2 nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar.lz nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar.xz nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.tar.zst nixlib-a26e94a278baa5cebacbab5d8ec87c5a8b9d0b44.zip | |
Merge pull request #258277 from wegank/viewnior-exiv2
viewnior: add patch for exiv2 0.28
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/viewnior/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 2a1dbe44f361..74cc2bdc4e8d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -9,9 +9,22 @@ stdenv.mkDerivation rec { owner = "hellosiyan"; repo = "Viewnior"; rev = "${pname}-${version}"; - sha256 = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; + hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; }; + patches = [ + (fetchpatch { + name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE="; + }) + (fetchpatch { + name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY="; + }) + ]; + nativeBuildInputs = [ meson ninja |