public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert commit 4b2f397198

Browse Source 
This reverts commit 4b2f397198. 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
This commit is contained in:
Matthew Bauer
2018-05-31 12:34:16 -04:00
parent 03b3148beb
commit 85ae7137ac
3 changed files with 18 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
-13
View File
@@ -1,13 +0,0 @@
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -85,8 +85,8 @@
'aero.gif',
]
-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name())
+installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name())
+installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name())
install_data(test_data, install_dir: installed_test_bindir)
install_subdir('test-images', install_dir: installed_test_bindir)