[gnome-books/wip/hadess/app-provided-pixbuf-loader: 5/5] flatpak: Use new application-provided pixbuf loaders

[Bastien Nocera <hadess src gnome org>]

commit ce42ee14f37e8d793b5616d665e40cda4f3f07c7
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 28 15:11:58 2019 +0100

    flatpak: Use new application-provided pixbuf loaders

 flatpak/org.gnome.Books.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/flatpak/org.gnome.Books.json b/flatpak/org.gnome.Books.json
index 60bd889c..ba0672da 100644
--- a/flatpak/org.gnome.Books.json
+++ b/flatpak/org.gnome.Books.json
@@ -21,8 +21,6 @@
         "--talk-name=org.freedesktop.Tracker1",
         "--talk-name=org.freedesktop.Tracker1.Miner.Extract",
         "--env=TRACKER_SPARQL_BACKEND=bus",
-        /* For the WebP loader */
-        "--env=GDK_PIXBUF_MODULE_FILE=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache",
         /* Needed for dconf to work */
         "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
@@ -47,6 +45,9 @@
         {
             "name": "webp-pixbuf-loader",
             "buildsystem": "cmake-ninja",
+            "env": {
+                "GDK_PIXBUF_MODULEDIR": "/app/lib/gnome-books/gdk-pixbuf/2.10.0/"
+            },
             "sources": [
                 {
                     "type": "git",
@@ -55,8 +56,7 @@
                 }
             ],
             "post-install": [
-                "GDK_PIXBUF_MODULEDIR=/app/lib/gdk-pixbuf-2.0/2.10.0/loaders/ gdk-pixbuf-query-loaders > 
loaders.cache",
-                "cat /usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders.cache loaders.cache > 
/app/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+                "gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULEDIR/loaders.cache"
             ]
         },
         {