From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJjMb-00050o-JB for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJjMY-0002xN-CK for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJjMY-0002xI-4p for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eJjMX-0001lm-To for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:01 -0500 Subject: [bug#29392] [PATCH 07/11] gnu: godot: Use scons-build-system. Resent-Message-ID: From: Arun Isaac Date: Tue, 28 Nov 2017 22:36:47 +0530 Message-Id: <20171128170651.6136-8-arunisaac@systemreboot.net> In-Reply-To: <20171128170651.6136-1-arunisaac@systemreboot.net> References: <20171128170651.6136-1-arunisaac@systemreboot.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29392@debbugs.gnu.org * gnu/packages/game-development.scm (godot): Switch to scons-build-system. --- gnu/packages/game-development.scm | 45 +++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index be241cbd3..3c544f554 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,26 @@ 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 ,scons-python2 + #: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 +1094,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 +1125,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 +1140,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