summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2021-10-12 21:19:35 +0300
committerEfraim Flashner <efraim@flashner.co.il>2021-10-12 21:19:35 +0300
commitb4b314cc53a19f640ceef99acb10880dbcc838b1 (patch)
treeb4dc37fd90e78ea065b28a060003b9f8ab24e5b4 /gnu
parent9c5a83c7e7f46f36f7913f0b4068886f30fca90e (diff)
downloadguix-b4b314cc53a19f640ceef99acb10880dbcc838b1.tar.gz
gnu: Remove references to meson-0.55.
This is a follow-up to 1eca979fb8da842e73c42f4f53be29b169810f2.

* gnu/packages/datastructures.scm, gnu/packages/fontutils.scm,
gnu/packages/terminals.scm: Don't import (gnu packages build-tools).
* gnu/packages/wm.scm: Remove comment.
* gnu/packages/emulators.scm (dosbox-staging)[arguments]: Remove meson
field.
* gnu/packages/package-management.scm (conan)[native-inputs]: Use meson.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/datastructures.scm1
-rw-r--r--gnu/packages/emulators.scm2
-rw-r--r--gnu/packages/fontutils.scm1
-rw-r--r--gnu/packages/package-management.scm2
-rw-r--r--gnu/packages/terminals.scm1
-rw-r--r--gnu/packages/wm.scm2
6 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 4973ce98af..e79fe76954 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -25,7 +25,6 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages boost)
-  #:use-module (gnu packages build-tools)   ;for meson-0.55
   #:use-module (gnu packages perl)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index ca7c91df04..420a2c2696 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -415,7 +415,7 @@ older games.")
         (base32 "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x"))))
     (build-system meson-build-system)
     (arguments
-     `(#:meson ,meson-0.55 #:configure-flags
+     `(#:configure-flags
        ;; These both try to git clone subprojects.
        (list "-Dunit_tests=disabled"     ; gtest
              "-Duse_mt32emu=false")))    ; mt32emu
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 2d24e9f047..7e8678e027 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -35,7 +35,6 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages build-tools)   ;for meson-0.55
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages datastructures)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index eea625130a..f768d7b103 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1173,7 +1173,7 @@ written entirely in Python.")
        ("automake" ,automake)
        ("cmake" ,cmake)                 ;requires cmake >= 3.17
        ("git" ,git-minimal)
-       ("meson" ,meson-0.55)
+       ("meson" ,meson)
        ("ninja",ninja)
        ("pkg-config" ,pkg-config)
        ("python-bottle" ,python-bottle)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 785f05a8c4..01b8f7a1e2 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -59,7 +59,6 @@
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages build-tools)   ;for meson-0.55
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index acdee6f689..5e173484de 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -81,7 +81,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages build-tools) ;for meson-0.55
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)