From 8311a844164c1637c731f33bca9331a90d79678d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 15 Mar 2018 11:22:03 +0100 Subject: gnu: godot: Add a file extension to source file name. * gnu/packages/game-development.scm (godot)[source](file-name): Append ".tar.gz". --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0039a738cc..edbc9c0ca5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1070,7 +1070,7 @@ games.") (uri (string-append "https://github.com/godotengine/godot/archive/" version "-stable.tar.gz")) - (file-name (string-append name "-" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p")))) -- cgit v1.2.3 From 5b8d2ace9377b5bbfa1095545b1e9fba1a2d16ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 15 Mar 2018 11:38:48 +0100 Subject: gnu: godot: Remove unused bundled libraries from the source. While at it, also use system libvpx. * gnu/packages/game-development.scm (godot)[source](snippet): New field. [arguments]: Add "builtin_libvpx=no" to #:scons-flags. [inputs]: Add LIBVPX. --- gnu/packages/game-development.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index edbc9c0ca5..f6c9eba8c2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -1073,7 +1074,25 @@ games.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p")))) + "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Drop libraries that we take from Guix. Note that some + ;; of these may be modified; see "thirdparty/README.md". + (with-directory-excursion "thirdparty" + (for-each delete-file-recursively + '("freetype" + "libogg" + "libpng" + "libtheora" + "libvorbis" + "libvpx" + "libwebp" + "openssl" + "opus" + "zlib")) + #t))))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 @@ -1091,6 +1110,7 @@ games.") "builtin_libpng=no" "builtin_libtheora=no" "builtin_libvorbis=no" + "builtin_libvpx=no" "builtin_libwebp=no" "builtin_openssl=no" "builtin_opus=no" @@ -1146,6 +1166,7 @@ games.") ("glu" ,glu) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) + ("libvpx" ,libvpx) ("libwebp" ,libwebp) ("libx11" ,libx11) ("libxcursor" ,libxcursor) -- cgit v1.2.3 From af574d824a18f89a0f00acd99fc37dff131d827c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Apr 2018 15:25:00 +0200 Subject: gnu: godot: Update to 3.0.2. * gnu/packages/game-development.scm (godot): Update to 3.0.2. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f6c9eba8c2..86abf9f37c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1065,7 +1065,7 @@ games.") (define-public godot (package (name "godot") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri @@ -1074,7 +1074,7 @@ games.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p")) + "0ldnk3j4w2kh454mzclmq8nk7zqrn758yrqq85i4kzljpkf93g0m")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3