mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
0a167432db
* gnu/packages/freedesktop.scm (shared-mime-info): Update to 2.2. [source]: Use git-fetch. [build-system]: Use meson-build-system. [arguments]<#:parallel-build?>: Removed argument. <#:phases>: Replace ‘patch-source-shebangs’ with a version that skips mime detection checks. [native-inputs]: Drop labels. Add python and xdgmime. Remove itstool. * gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
Adapted from <https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/182>.
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 3c75424..7058562 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -26,11 +26,11 @@ xmlto = find_program('xmlto', required: false)
|
|
###############################################################################
|
|
# Find xdgmime
|
|
|
|
-xdgmime = get_option('xdgmime-path') / 'src'
|
|
+xdgmime = get_option('xdgmime-path')
|
|
|
|
-xdgmime_print_mime_data = find_program(xdgmime/'print-mime-data', required: false)
|
|
-xdgmime_test_mime_data = find_program(xdgmime/'test-mime-data', required: false)
|
|
-xdgmime_test_mime = find_program(xdgmime/'test-mime', required: false)
|
|
+xdgmime_print_mime_data = find_program('print-mime-data', xdgmime/'print-mime-data', required: false)
|
|
+xdgmime_test_mime_data = find_program('test-mime-data', xdgmime/'test-mime-data', required: false)
|
|
+xdgmime_test_mime = find_program('test-mime', xdgmime/'test-mime', required: false)
|
|
xdgmime_found = (
|
|
xdgmime_print_mime_data.found() and
|
|
xdgmime_test_mime_data.found() and
|