diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-31 11:41:14 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-31 12:34:16 -0400 |
| commit | 85ae7137ac6a1623be90c8f0897566367d300c12 (patch) | |
| tree | 09b9ff8068e1583f88052e3604bc0c097ad361c3 /pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch | |
| parent | 03b3148beb975645b762bfd9f6961d967a926a5e (diff) | |
Revert commit 4b2f3971981272b79da7f87b639ca8854a6ea89c
This reverts commit 4b2f3971981272b79da7f87b639ca8854a6ea89c. It updated gdk_pixbuf to 2.36.12 but unfortunately broke macOS builds. The new mime sniffing is not working correctly so that .png files cannot be built. Fixes #41314 /cc @jtojnar @lnl7
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch')
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch deleted file mode 100644 index 9896e25acda1c..0000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -186,13 +186,8 @@ - gmodule_dep = dependency('gmodule-no-export-2.0') - gio_dep = dependency('gio-2.0') - --# On non-Windows/macOS systems we always required shared-mime-info and GIO --if host_system != 'windows' and host_system != 'darwin' -- shared_mime_dep = dependency('shared-mime-info') -- gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1) --else -- shared_mime_dep = [] --endif -+# No MIME sniffing for now -+shared_mime_dep = [] - - gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ] - |