diff --git a/pkgs/by-name/gd/gdk-pixbuf/package.nix b/pkgs/by-name/gd/gdk-pixbuf/package.nix index 196d9582cf80..0a1e32428806 100644 --- a/pkgs/by-name/gd/gdk-pixbuf/package.nix +++ b/pkgs/by-name/gd/gdk-pixbuf/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, + fetchpatch, nixosTests, fixDarwinDylibNames, meson, @@ -46,6 +47,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Move installed tests to a separate output ./installed-tests-path.patch + + # Fix loading of xpm module if built-in + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/267 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/62b8f9fd0bb3b862823cd34afce4b389fbd27569.patch"; + hash = "sha256-ECEIt8lq/jBtDdBetErKpap2PWGav10vqCXKCpIQSyA="; + }) ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -83,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + # https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/work_items/13 + "-Dlegacy_xpm=enabled" "-Dgio_sniffing=false" "-Dandroid=disabled" "-Dglycin=disabled"