From a1e9a94785cf885487d823790aa82dc82fe5924c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 3 Jan 2021 12:52:03 +0100 Subject: [PATCH] imv: 4.1.0 -> 4.2.0 * switch build system to wayland * enable all backends by adding the following to buildInputs as meson autodetects which backends are available. * libtiff * libheif * libpng Open questions: * imv prints a warning from the tiff backend everytime a non tiff file is opened: Is this normal? Seems harmless enough though. * Should we make backends configurable / optional? I readded some backends which apparently were removed, but still given as an argument to the derivation. Resolves #108185. --- pkgs/applications/graphics/imv/default.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index faf74873058..9b69aa9ec0f 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -18,20 +18,30 @@ , pkgconfig , stdenv , wayland +, meson +, ninja +, inih }: stdenv.mkDerivation rec { pname = "imv"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; rev = "v${version}"; - sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; + sha256 = "07pcpppmfvvj0czfvp1cyq03ha0jdj4whl13lzvw37q3vpxs5qqh"; }; - nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; + nativeBuildInputs = [ + asciidoc + cmocka + docbook_xsl + libxslt + meson + ninja + ]; buildInputs = [ freeimage @@ -44,12 +54,12 @@ stdenv.mkDerivation rec { pango pkgconfig wayland + inih + libtiff + libheif + libpng ]; - installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; - - makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ]; - postFixup = '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store