3 files changed, 26 insertions, 46 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff b/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
deleted file mode 100644
index 7993cecd30add..0000000000000
--- a/pkgs/desktops/deepin/apps/deepin-reader/use-pkg-config.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-index 3e04f340..894b0ac7 100755
---- a/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-+++ b/3rdparty/deepin-pdfium/src/3rdparty/pdfium/pdfium.pri
-@@ -20,13 +20,8 @@ DEFINES +=  USE_SYSTEM_LIBJPEG \
-             USE_SYSTEM_LIBOPENJPEG2 \
-             USE_SYSTEM_FREETYPE
- 
--INCLUDEPATH += /usr/include/openjpeg-2.3 \
--               /usr/include/openjpeg-2.4 \
--               /usr/include/freetype2 \
--               /usr/include/freetype2/freetype \
--               /usr/include/freetype2/freetype/config
--
--LIBS += -lopenjp2 -llcms2 -lfreetype
-+CONFIG += link_pkgconfig
-+PKGCONFIG += libopenjp2 lcms2 freetype2
- 
- #QMAKE_CXXFLAGS += "-Wc++11-narrowing"  #is_clang
- #QMAKE_CXXFLAGS += "-Wno-inconsistent-missing-override"  #is_clang Suppress no override warning for overridden functions.
-diff --git a/3rdparty/deepin-pdfium/src/src.pro b/3rdparty/deepin-pdfium/src/src.pro
-index 196b91d3..bda71ff4 100755
---- a/3rdparty/deepin-pdfium/src/src.pro
-+++ b/3rdparty/deepin-pdfium/src/src.pro
-@@ -2,7 +2,9 @@ TARGET = $$PWD/../lib/deepin-pdfium
- 
- TEMPLATE = lib
- 
--CONFIG += c++14
-+CONFIG += c++14 link_pkgconfig
-+
-+PKGCONFIG += chardet
- 
- ###安全漏洞检测
- #QMAKE_CXX += -g -fsanitize=undefined,address -O2
-@@ -28,10 +30,6 @@ include($$PWD/3rdparty/pdfium/pdfium.pri)
- 
- INCLUDEPATH += $$PWD/../include
- 
--INCLUDEPATH += /usr/include/chardet
--
--LIBS += -lchardet
--
- public_headers += \
-     $$PWD/../include/dpdfglobal.h \
-     $$PWD/../include/dpdfdoc.h \
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 93941346dcc75..0a6a622e777ce 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -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";
diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
index f43a465ed98b0..fd0e375033c0c 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -6,8 +6,11 @@
 , freetype
 , libgepub
 , libgsf
+, libjxl
+, librsvg
 , poppler
 , gst_all_1
+, webp-pixbuf-loader
 , libxfce4util
 }:
 
@@ -32,6 +35,13 @@ mkXfceDerivation {
     poppler # technically the glib binding
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Thumbnailers
+      --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ libjxl librsvg webp-pixbuf-loader ]}"
+    )
+  '';
+
   # WrapGAppsHook won't touch this binary automatically, so we wrap manually.
   postFixup = ''
     wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"