Unverified Commit 376250fa authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

xfce.tumbler, xfce.ristretto: Add HEIF support (#372912)

parents 6fba2ab9 b320fc9b

pkgs/desktops/xfce/applications/ristretto/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  glib,

  gnome,

  libexif,

  libheif,

  libjxl,

  librsvg,

  libxfce4ui,
@@ -31,11 +32,12 @@ mkXfceDerivation { 
  ];



  postInstall = ''

    # Pull in JXL and WebP support for ristretto.

    # Pull in HEIF, JXL and WebP support for ristretto.

    # In postInstall to run before gappsWrapperArgsHook.

    export GDK_PIXBUF_MODULE_FILE="${

      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

        extraLoaders = [

          libheif.out

          libjxl

          librsvg

          webp-pixbuf-loader

pkgs/desktops/xfce/core/tumbler/default.nix

+27 −16
Original line number Diff line number Diff line 
{ lib

, mkXfceDerivation

, ffmpegthumbnailer

, gdk-pixbuf

, glib

, freetype

, libgepub

, libgsf

, libjxl

, librsvg

, poppler

, gst_all_1

, webp-pixbuf-loader

, libxfce4util

{

  lib,

  mkXfceDerivation,

  ffmpegthumbnailer,

  gdk-pixbuf,

  glib,

  freetype,

  libgepub,

  libgsf,

  libheif,

  libjxl,

  librsvg,

  poppler,

  gst_all_1,

  webp-pixbuf-loader,

  libxfce4util,

}:



# TODO: add libopenraw
@@ -38,13 +40,22 @@ mkXfceDerivation { 
  preFixup = ''

    gappsWrapperArgs+=(

      # Thumbnailers

      --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ libjxl librsvg webp-pixbuf-loader ]}"

      --prefix XDG_DATA_DIRS : "${

        lib.makeSearchPath "share" [

          libheif.out

          libjxl

          librsvg

          webp-pixbuf-loader

        ]

      }"

      # For heif-thumbnailer in heif.thumbnailer

      --prefix PATH : "${lib.makeBinPath [ libheif ]}"

    )

  '';



  # WrapGAppsHook won't touch this binary automatically, so we wrap manually.

  postFixup = ''

    wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"

    wrapGApp $out/lib/tumbler-1/tumblerd

  '';



  meta = with lib; {