diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 67ac1cfa970..2459c3535e9 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -23,6 +23,7 @@ , wrapGAppsHook , librsvg , webp-pixbuf-loader +, libheif , libexif , gobject-introspection , gi-docgen @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { extraLoaders = [ librsvg webp-pixbuf-loader + libheif.out ]; }}" ''; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 8ecb6c6d96c..5d008f394e8 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -10,6 +10,7 @@ , libpng , libjpeg , libaom +, gdk-pixbuf # for passthru.tests , gimp @@ -32,11 +33,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + dav1d + rav1e + libde265 + x265 + libpng + libjpeg + libaom + gdk-pixbuf + ]; 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 = { inherit gimp imagemagick imlib2Full imv vips; };