Merge pull request #212842 from jtojnar/heif
gnome.eog: Add HEIF support
This commit is contained in:
commit
165c01c706
|
@ -23,6 +23,7 @@
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, librsvg
|
, librsvg
|
||||||
, webp-pixbuf-loader
|
, webp-pixbuf-loader
|
||||||
|
, libheif
|
||||||
, libexif
|
, libexif
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gi-docgen
|
, gi-docgen
|
||||||
|
@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
|
||||||
extraLoaders = [
|
extraLoaders = [
|
||||||
librsvg
|
librsvg
|
||||||
webp-pixbuf-loader
|
webp-pixbuf-loader
|
||||||
|
libheif.out
|
||||||
];
|
];
|
||||||
}}"
|
}}"
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
, libpng
|
, libpng
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, libaom
|
, libaom
|
||||||
|
, gdk-pixbuf
|
||||||
|
|
||||||
# for passthru.tests
|
# for passthru.tests
|
||||||
, gimp
|
, gimp
|
||||||
|
@ -32,11 +33,27 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s=";
|
sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ];
|
autoreconfHook
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
dav1d
|
||||||
|
rav1e
|
||||||
|
libde265
|
||||||
|
x265
|
||||||
|
libpng
|
||||||
|
libjpeg
|
||||||
|
libaom
|
||||||
|
gdk-pixbuf
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
# Fix installation path for gdk-pixbuf module
|
||||||
|
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit gimp imagemagick imlib2Full imv vips;
|
inherit gimp imagemagick imlib2Full imv vips;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue