ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 23:20:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove references to meson-0.55.

Browse source 
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.
This commit is contained in:
Efraim Flashner 2021-10-12 21:19:35 +03:00
parent 9c5a83c7e7
commit b4b314cc53
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
6 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/datastructures.scm
View file

@ -25,7 +25,6 @@ (define-module (gnu packages datastructures)
#: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)

2
gnu/packages/emulators.scm
View file

@ -415,7 +415,7 @@ (define-public dosbox-staging
(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

1
gnu/packages/fontutils.scm
View file

@ -35,7 +35,6 @@ (define-module (gnu packages fontutils)
#: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)

2
gnu/packages/package-management.scm
View file

@ -1173,7 +1173,7 @@ (define system ,(or (%current-target-system)
("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)

1
gnu/packages/terminals.scm
View file

@ -59,7 +59,6 @@ (define-module (gnu packages terminals)
#: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)

2
gnu/packages/wm.scm
View file

@ -81,7 +81,7 @@ (define-module (gnu packages wm)
#: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)