viewnior: switch to gtk3 PR (#349819)

authored by Aleksana and committed by GitHub a5e6a9e9 96fd503b

+29 -21
+29 -21
pkgs/applications/graphics/viewnior/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms 2 - , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: 3 4 stdenv.mkDerivation rec { 5 - pname = "viewnior"; 6 - version = "1.8"; 7 8 src = fetchFromGitHub { 9 - owner = "hellosiyan"; 10 repo = "Viewnior"; 11 - rev = "${pname}-${version}"; 12 - hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; 13 }; 14 15 - patches = [ 16 - (fetchpatch { 17 - name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch"; 18 - 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"; 19 - hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE="; 20 - }) 21 - (fetchpatch { 22 - name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch"; 23 - 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"; 24 - hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY="; 25 - }) 26 - ]; 27 - 28 nativeBuildInputs = [ 29 meson 30 ninja ··· 32 desktop-file-utils 33 intltool 34 gettext 35 ]; 36 37 buildInputs = [ 38 - gtk2 39 libpng 40 exiv2 41 lcms ··· 44 gdk-pixbuf 45 perl 46 ]; 47 48 meta = with lib; { 49 description = "Fast and simple image viewer";
··· 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms 2 + , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl, wrapGAppsHook3, webp-pixbuf-loader, gnome, librsvg}: 3 4 stdenv.mkDerivation rec { 5 + pname = "viewnior-gtk3"; 6 + version = "1.8-unstable-2023-11-23"; 7 8 src = fetchFromGitHub { 9 + #owner = "hellosiyan"; 10 + #repo = "Viewnior"; 11 + owner = "Artturin"; 12 repo = "Viewnior"; 13 + # https://github.com/hellosiyan/Viewnior/pull/142 14 + rev = "23ce6e5630b24509d8009f17a833ad9e59b85fab"; 15 + hash = "sha256-+/f0+og1Dd7eJK7P83+q4lf4SjzW2g6qNk8ZTxNAuDA="; 16 }; 17 18 nativeBuildInputs = [ 19 meson 20 ninja ··· 22 desktop-file-utils 23 intltool 24 gettext 25 + wrapGAppsHook3 26 ]; 27 28 buildInputs = [ 29 + gtk3 30 libpng 31 exiv2 32 lcms ··· 35 gdk-pixbuf 36 perl 37 ]; 38 + 39 + postInstall = '' 40 + export GDK_PIXBUF_MODULE_FILE="${ 41 + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { 42 + extraLoaders = [ 43 + webp-pixbuf-loader 44 + librsvg 45 + ]; 46 + } 47 + }" 48 + 49 + # gtk3 viewnior can be launched in wayland mode and does so by default 50 + # but moving around in a zoomed in image doesn't work 51 + gappsWrapperArgs+=( 52 + --set-default GDK_BACKEND x11 53 + ) 54 + ''; 55 56 meta = with lib; { 57 description = "Fast and simple image viewer";