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.
This commit is contained in:
sternenseemann 2021-01-03 12:52:03 +01:00
parent 3d2ffa3dbf
commit a1e9a94785

View File

@ -18,20 +18,30 @@
, pkgconfig , pkgconfig
, stdenv , stdenv
, wayland , wayland
, meson
, ninja
, inih
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imv"; pname = "imv";
version = "4.1.0"; version = "4.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eXeC64"; owner = "eXeC64";
repo = "imv"; repo = "imv";
rev = "v${version}"; rev = "v${version}";
sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; sha256 = "07pcpppmfvvj0czfvp1cyq03ha0jdj4whl13lzvw37q3vpxs5qqh";
}; };
nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; nativeBuildInputs = [
asciidoc
cmocka
docbook_xsl
libxslt
meson
ninja
];
buildInputs = [ buildInputs = [
freeimage freeimage
@ -44,12 +54,12 @@ stdenv.mkDerivation rec {
pango pango
pkgconfig pkgconfig
wayland wayland
inih
libtiff
libheif
libpng
]; ];
installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ];
makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ];
postFixup = '' postFixup = ''
# The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # 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 # so we have to fix those to the binaries we installed into the /nix/store