Unverified Commit 165c01c7 authored by Jan Tojnar's avatar Jan Tojnar Committed by GitHub
Browse files

Merge pull request #212842 from jtojnar/heif 

gnome.eog: Add HEIF support
parents 780c9899 7f06dbef

pkgs/desktops/gnome/core/eog/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

      ];

    }}"

  '';

pkgs/development/libraries/libheif/default.nix

+19 −2
Original line number Diff line number Diff line
@@ -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;

  };