From: Arun Isaac <arunisaac@systemreboot.net>
To: 29392@debbugs.gnu.org
Subject: [bug#29392] [PATCH 07/11] gnu: godot: Use scons-build-system.
Date: Wed, 22 Nov 2017 15:05:03 +0530 [thread overview]
Message-ID: <20171122093507.6827-7-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20171122093507.6827-1-arunisaac@systemreboot.net>
* gnu/packages/game-development.scm (godot): Switch to scons-build-system.
---
gnu/packages/game-development.scm | 44 +++++++++++++++++----------------------
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index be241cbd3..a98b40c49 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -37,6 +37,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
+ #:use-module (guix build-system scons)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
@@ -1063,12 +1064,25 @@ games.")
(file-name (string-append name "-" version))
(sha256
(base32 "1mz89nafc1m7srbqvy7iagxrxmqvf5hbqi7i0lwaapkx6q0kpkq7"))))
- (build-system gnu-build-system)
+ (build-system scons-build-system)
(arguments
- `(#:tests? #f ; There are no tests
+ `(#:scons-flags (list "platform=x11"
+ ;; Avoid using many of the bundled libs.
+ ;; Note: These options can be found in the SConstruct file.
+ "builtin_freetype=no"
+ "builtin_glew=no"
+ "builtin_libmpdec=no"
+ "builtin_libogg=no"
+ "builtin_libpng=no"
+ "builtin_libtheora=no"
+ "builtin_libvorbis=no"
+ "builtin_libwebp=no"
+ "builtin_openssl=no"
+ "builtin_opus=no"
+ "builtin_zlib=no")
+ #:tests? #f ; There are no tests
#:phases
(modify-phases %standard-phases
- (delete 'configure)
(add-after 'unpack 'scons-use-env
(lambda _
;; Scons does not use the environment variables by default,
@@ -1079,24 +1093,6 @@ games.")
"env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)")))
#t))
- (replace 'build
- (lambda _
- (zero? (system*
- "scons"
- "platform=x11"
- ;; Avoid using many of the bundled libs.
- ;; Note: These options can be found in the SConstruct file.
- "builtin_freetype=no"
- "builtin_glew=no"
- "builtin_libmpdec=no"
- "builtin_libogg=no"
- "builtin_libpng=no"
- "builtin_libtheora=no"
- "builtin_libvorbis=no"
- "builtin_libwebp=no"
- "builtin_openssl=no"
- "builtin_opus=no"
- "builtin_zlib=no"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -1128,8 +1124,7 @@ games.")
Type=Application~%"
out)))
#t))))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("scons" ,scons)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("alsa-lib" ,alsa-lib)
("freetype" ,freetype)
("glew" ,glew)
@@ -1144,8 +1139,7 @@ games.")
("mesa" ,mesa)
("openssl" ,openssl)
("opusfile" ,opusfile)
- ("pulseaudio" ,pulseaudio)
- ("python2" ,python-2)))
+ ("pulseaudio" ,pulseaudio)))
(home-page "https://godotengine.org/")
(synopsis "Advanced 2D and 3D game engine")
(description
--
2.15.0
next prev parent reply other threads:[~2017-11-22 9:52 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-22 8:41 [bug#29392] [PATCH 00/11] New scons build system Arun Isaac
2017-11-22 9:34 ` [bug#29392] [PATCH 01/11] gnu: scons: Update to 3.0.1 Arun Isaac
2017-11-22 9:34 ` [bug#29392] [PATCH 02/11] build-system: Add scons-build-system Arun Isaac
2017-11-26 21:04 ` Leo Famulari
2017-11-22 9:34 ` [bug#29392] [PATCH 03/11] gnu: linuxdcpp: Use scons-build-system Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 04/11] gnu: gpick: " Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 05/11] gnu: serf: " Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 06/11] gnu: metabat: " Arun Isaac
2017-11-22 9:35 ` Arun Isaac [this message]
2017-11-22 9:35 ` [bug#29392] [PATCH 08/11] gnu: pingus: " Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 09/11] gnu: klick: " Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 10/11] gnu: mongodb: " Arun Isaac
2017-11-22 9:35 ` [bug#29392] [PATCH 11/11] gnu: pingus: Use HTTPS for home page Arun Isaac
2017-11-25 16:04 ` [bug#29392] [PATCH 00/11] New scons build system Leo Famulari
2017-11-25 16:05 ` Leo Famulari
2017-11-26 11:17 ` Arun Isaac
2017-11-26 1:26 ` Leo Famulari
2017-11-26 16:17 ` Ludovic Courtès
2017-11-26 18:51 ` Leo Famulari
2017-11-28 17:06 ` [bug#29392] [PATCH 00/11] Add " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 01/11] gnu: scons: Update to 3.0.1 Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 02/11] build-system: Add scons-build-system Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 03/11] gnu: linuxdcpp: Use scons-build-system Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 04/11] gnu: gpick: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 05/11] gnu: serf: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 06/11] gnu: metabat: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 07/11] gnu: godot: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 08/11] gnu: pingus: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 09/11] gnu: klick: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 10/11] gnu: mongodb: " Arun Isaac
2017-11-28 17:06 ` [bug#29392] [PATCH 11/11] gnu: pingus: Use HTTPS for home page Arun Isaac
2017-11-28 21:38 ` [bug#29392] [PATCH 00/11] Add scons build system Leo Famulari
2017-11-29 8:19 ` Arun Isaac
2017-11-29 21:29 ` Leo Famulari
2017-11-30 13:40 ` bug#29392: " Arun Isaac
2017-11-30 17:05 ` [bug#29392] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171122093507.6827-7-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=29392@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).