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

bhipple · Jan 11, 2025 · 376250f · 376250f
2 parents 6fba2ab + b320fc9
commit 376250f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 17 deletions.
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -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

diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -1,17 +1,19 @@
-{ 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; {