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

xfce.tumbler, xfce.ristretto: enable JXL and WebP support (#340472)

parents 31a69c3d e2210d16

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

+16 −0
Original line number Diff line number Diff line
@@ -2,9 +2,13 @@ 
, mkXfceDerivation

, gtk3

, glib

, gnome

, libexif

, libjxl

, librsvg

, libxfce4ui

, libxfce4util

, webp-pixbuf-loader

, xfconf

}:
@@ -27,6 +31,18 @@ mkXfceDerivation { 


  env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";



  postInstall = ''

    # Pull in JXL and WebP support for ristretto.

    # In postInstall to run before gappsWrapperArgsHook.

    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

      extraLoaders = [

        libjxl

        librsvg

        webp-pixbuf-loader

      ];

    }}"

  '';



  meta = with lib; {

    description = "Fast and lightweight picture-viewer for the Xfce desktop environment";

    mainProgram = "ristretto";

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

+4 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
, freetype

, libgepub

, libgsf

, libjxl

, librsvg

, poppler

, gst_all_1

, webp-pixbuf-loader
@@ -35,7 +37,8 @@ mkXfceDerivation { 


  preFixup = ''

    gappsWrapperArgs+=(

      --prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"

      # Thumbnailers

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

    )

  '';