diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-06-07 13:12:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 13:12:01 +0200 |
| commit | 4bc410f1b583c2bdf29cbaefa533de7c5ef93ed1 (patch) | |
| tree | 836314f20a8b5318cc663731683c345d2b98cc69 /pkgs/development | |
| parent | 29327b68ddd92d2a1f41e8d0683881fa8b71b5ad (diff) | |
| parent | 7316e2d8796e6a00aa61133481fd9de5a0349669 (diff) | |
Merge pull request #315119 from Mic92/webp-pixbuf-loader-cross
webp-pixbuf-loader: fix cross-comilation
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/webp-pixbuf-loader/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/development/libraries/webp-pixbuf-loader/default.nix index b3f4e4d483901..78496c0e919e3 100644 --- a/pkgs/development/libraries/webp-pixbuf-loader/default.nix +++ b/pkgs/development/libraries/webp-pixbuf-loader/default.nix @@ -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" |