From 46873adc04ccf2c753362ee14c7faa81fed602c4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 Apr 2023 10:39:49 -0400 Subject: [PATCH] gnu: Remove extraneous #:meson build arguments. * gnu/packages/build-tools.scm (meson-python) [propagated-inputs]: Replace meson-0.63 with meson. * gnu/packages/freedesktop.scm (appstream) [arguments]: Remove #:meson argument. * gnu/packages/gnome.scm (raider): Likewise. (komikku): Likewise. * gnu/packages/syndication.scm (syndication-domination): Likewise. * gnu/packages/virtualization.scm (qemu): Likewise. * gnu/packages/xdisorg.scm (tofi): Likewise. --- gnu/packages/build-tools.scm | 2 +- gnu/packages/freedesktop.scm | 1 - gnu/packages/geo.scm | 1 - gnu/packages/gnome.scm | 4 +--- gnu/packages/syndication.scm | 2 -- gnu/packages/virtualization.scm | 1 - gnu/packages/xdisorg.scm | 2 -- 7 files changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 4736641a63347be9fe423c80a9c8020a65f655ab..29871eee2680678996a8084297536937ec7ee4fe 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -408,7 +408,7 @@ resembles Python.") "test_contents_subdirs") " and not "))))))))) (propagated-inputs - (list meson-0.63 ;>=0.62 required + (list meson ninja ;; XXX: python-meson forcefully sets the RUNPATH of binaries ;; for vendoring purposes, and uses PatchELF for that(!). This diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 5ef5e9099dee4d83eaf38a4b1edcb6103e26463f..5074ed08076acc5b8e268e210fc0f5d75af2d065 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -149,7 +149,6 @@ (build-system meson-build-system) (arguments (list - #:meson meson-0.63 #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9465c0eda768de5694eee0f7debdf11a3c4d5db0..5670574c0dea14931b9cda75c085b063bc6a9fbc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -340,7 +340,6 @@ topology functions.") (arguments (list #:glib-or-gtk? #t - #:meson meson-0.63 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'skip-cache-and-database-updates diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 970ab9b87349e332d387cc7cd4d50b93d47ea754..42bac783b6ecae0109092887816508200b40c4cc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4948,8 +4948,7 @@ from the GSettings schemas in gsettings-desktop-schemas.") "0ll9220d6qf9m7wdi5xhq69p8h8whs7l5h5nzdhlbn99qh5388bz")))) (build-system meson-build-system) (arguments - (list #:meson meson-0.63 - #:phases + (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -13128,7 +13127,6 @@ profiler via Sysprof, debugging support, and more.") (arguments (list #:glib-or-gtk? #t - #:meson meson-0.63 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-sources diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 769cc85d37787895428beac12a029d3fcca649f9..6224f58efcf11abb9b04d13c46b92aae3d6c9d62 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -523,8 +523,6 @@ a simple interface that makes it easy to organize and browse feeds.") (sha256 (base32 "1i0llzzm3lc2kw7rjhb46c7wlknsb6r9bdrf61chi2pk6hpjyscv")))) (build-system meson-build-system) - (arguments - (list #:meson meson-0.63)) (inputs (list fmt tidy-html pybind11 python pugixml)) (native-inputs (list cmake pkg-config)) ; need cmake to find pybind11 (home-page "https://gitlab.com/gabmus/syndication-domination") diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1c1b06d271ee11f7e432fdbcec79a213e1ffbc65..db90142332b3f973447137e0a09aa1a56aecc4ab 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -472,7 +472,6 @@ exec smbd $@"))) flex gettext-minimal `(,glib "bin") ;gtester, etc. - meson-0.63 ninja perl pkg-config diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d1228a110e10f9b6bdda3dd54a3ea0f0052509e6..ae6305b425c2e1f7b3f5c0249c7525ba3ba52712 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1995,8 +1995,6 @@ actions, a built-in clock, a battery monitor and a system tray.") (base32 "11bfi9his0cc5mzikamr5icv5mh2fyj9jy5l3sbbayj6jk51f68y")))) (build-system meson-build-system) - (arguments - (list #:meson meson-0.63)) ;requires meson 0.61 or later (native-inputs (list pkg-config)) (inputs (list cairo harfbuzz