guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit ad412787ddab51abbbae40d49b09a337fe616a9b
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Mon Jun 23 20:05:01 2025 +0100
gnu: meson: Update to 1.9.0.
* gnu/packages/build-tools.scm (meson): Update to 1.9.0.
[build-system]: Use pyproject.
[native-inputs]: Add python-setuptools.
[#:phases]: Adjust 'wrap phase for pyproject-build-system.
(meson-1.8): Remove variable.
* gnu/packages/gl.scm (mesa)[arguments]: Remove #:meson.
Co-authored-by: Liliana Marie Prikler <[email protected]>
Co-authored-by: Dariqq <[email protected]>
Change-Id: I31932f24d1a54b8c79987296daaeb5a5285a8344
Signed-off-by: Liliana Marie Prikler <[email protected]>
Co-authored-by: John Kehayias <[email protected]>
(cherry picked from commit 3bcc621b2f4be2f75aaf2d8fa175f4f8df4f5688)
---
gnu/packages/build-tools.scm | 33 +++++++++++----------------------
gnu/packages/gl.scm | 1 -
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 74c7485178..62b383179d 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -309,7 +309,7 @@ files and generates build instructions for the Ninja build
system.")
(define-public meson
(package
(name "meson")
- (version "1.5.2")
+ (version "1.9.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/mesonbuild/meson/";
@@ -317,8 +317,8 @@ files and generates build instructions for the Ninja build
system.")
version ".tar.gz"))
(sha256
(base32
- "02wi62k9w7716xxdgrrx68q89vaq3ncnbpw5ms0g27npn2df0mgr"))))
- (build-system python-build-system)
+ "13a9pj7d2mxgv5gbd78di4pb4w722vjis0vmk38m1vdm95v2f9yd"))))
+ (build-system pyproject-build-system)
(arguments
(list #:tests? #f ;disabled to avoid extra dependencies
#:phases
@@ -328,12 +328,14 @@ files and generates build instructions for the Ninja
build system.")
(replace 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* (search-input-file outputs "bin/meson")
- (("# EASY-INSTALL-ENTRY-SCRIPT")
- (format #f "\
-import sys
-sys.path.insert(0, '~a')
-# EASY-INSTALL-ENTRY-SCRIPT" (site-packages inputs outputs)))))))))
- (inputs (list python ninja/pinned))
+ (("import sys" all)
+ (string-append
+ all "\n"
+ "sys.path.insert(0, '"
+ (site-packages inputs outputs)
+ "')"))))))))
+ (native-inputs (list python-setuptools))
+ (inputs (list python ninja))
(home-page "https://mesonbuild.com/";)
(synopsis "Build system designed to be fast and user-friendly")
(description
@@ -345,19 +347,6 @@ files}, are written in a custom domain-specific language
(@dfn{DSL}) that
resembles Python.")
(license license:asl2.0)))
-(define-public meson-1.8
- (package
- (inherit meson)
- (version "1.8.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/mesonbuild/meson/";
- "releases/download/" version "/meson-"
- version ".tar.gz"))
- (sha256
- (base32
- "1gvs2mm6z2b4pgsv1d9gl7cm68gqvcr244nh5p63g8f01y8sl67i"))))))
-
(define-public meson-python
(package
(name "meson-python")
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index ae2abd3bd1..fdeaee7e79 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -383,7 +383,6 @@ also known as DXTn or DXTC) for Mesa.")
(outputs '("out" "bin"))
(arguments
(list
- #:meson meson-1.8
#:configure-flags
#~(list
#$@(cond
