Merge pull request #308976 from qubitnano/pr/gdk-pixbuf

gdk-pixbuf: enable other loaders, disable ani loader

authored by Bobby Rong and committed by GitHub 104f6678 e5c70060

+11
+11
pkgs/development/libraries/gdk-pixbuf/default.nix
··· 21 21 , buildPackages 22 22 , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages 23 23 , gobject-introspection 24 + , fetchpatch 24 25 }: 25 26 26 27 stdenv.mkDerivation (finalAttrs: { ··· 41 42 patches = [ 42 43 # Move installed tests to a separate output 43 44 ./installed-tests-path.patch 45 + # Remove post 2.42.11 46 + (fetchpatch { 47 + name = "fix-meson.build-typo.patch"; 48 + url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch"; 49 + hash = "sha256-6IhdNH6hhygSXD7EJo/hoBLFeb2lJlBIHNBPTkA3Do0="; 50 + }) 44 51 ]; 45 52 46 53 # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work ··· 79 86 "-Dgio_sniffing=false" 80 87 (lib.mesonBool "gtk_doc" withIntrospection) 81 88 (lib.mesonEnable "introspection" withIntrospection) 89 + (lib.mesonEnable "others" true) 82 90 ]; 83 91 84 92 postPatch = '' ··· 93 101 substituteInPlace docs/meson.build \ 94 102 --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \ 95 103 --replace "'gi-docgen', req" "'gi-docgen', native:true, req" 104 + 105 + # Remove 'ani' loader until proper fix for CVE-2022-48622 106 + substituteInPlace meson.build --replace-fail "'ani'," "" 96 107 ''; 97 108 98 109 postInstall =