diff options
Diffstat (limited to 'gnu/packages/build-tools.scm')
| -rw-r--r-- | gnu/packages/build-tools.scm | 60 |
1 files changed, 16 insertions, 44 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index d2fb9e05df..2e5f1223cc 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -264,20 +264,31 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.53.2") + (version "0.58.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" "releases/download/" version "/meson-" version ".tar.gz")) + (patches + (list (origin + ;; Take a patch slated for 0.58.1 that fixes gtk-doc + ;; generation: <https://github.com/mesonbuild/meson/pull/8757>. + (method url-fetch) + (uri (string-append + "https://github.com/mesonbuild/meson/commit/" + "4e312c19e693a69b0650ce6c8a8903163c959996.patch")) + (file-name "meson-gtkdoc-generation.patch") + (sha256 + (base32 + "1nrwcxmzq1x9609yzhmhzgbq77yrkkd90vwiydilahwzwwrp68xi"))))) (sha256 (base32 - "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry")))) + "1p9g334xnfxpgrzdcnla7p399viny6jqrbylkw0rk74npkq0v0pl")))) (build-system python-build-system) (arguments - `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH - ;; patch in meson-for-build, and patching many hard-coded file system - ;; locations in "run_unittests.py". + `(;; FIXME: Tests require many additional inputs and patching many + ;; hard-coded file system locations in "run_unittests.py". #:tests? #f #:phases (modify-phases %standard-phases ;; Meson calls the various executables in out/bin through the @@ -296,45 +307,6 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that resembles Python.") (license license:asl2.0))) -;; Added temporarily for packages that need it. -;; TODO: Remove when core-updates is merged. -(define-public meson-0.55 - (package - (inherit meson) - (version "0.55.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "1070kjiirxxdfppmrhi3wsc6rykay1zlciqrzayjhjg0hkw42mrv")))))) - -(define-public meson-next - (package - (inherit meson) - (version "0.57.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs")))))) - -(define-public meson-for-build - (package - (inherit meson) - (name "meson-for-build") - (source (origin - (inherit (package-source meson)) - (patches (search-patches "meson-for-build-rpath.patch")))) - - ;; People should probably install "meson", not "meson-for-build". - (properties `((hidden? . #t))))) - (define-public premake4 (package (name "premake") |