Merge pull request #315119 from Mic92/webp-pixbuf-loader-cross

webp-pixbuf-loader: fix cross-comilation
This commit is contained in:
Jörg Thalheim
2024-06-07 13:12:01 +02:00
committed by GitHub
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \
gdk-pixbuf-query-loaders --update-cache
# gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f)
# and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist.
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
# So we replace it with a wrapped executable.
mkdir -p "$out/bin"