aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/game-development.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-05-06 15:56:24 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-05-06 15:56:24 +0200
commit12bd588346f8b2fb3709acfe0ee89d153da2db34 (patch)
tree459d8eb13a0508170ba462fe61a8b45fb55ea79f /gnu/packages/game-development.scm
parent7d5adf013127c89826e9fbe9f1a67265b3538609 (diff)
parent8e020519b45bbdb9403164bd4403f2465bac99ad (diff)
downloadguix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar
guix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/game-development.scm')
-rw-r--r--gnu/packages/game-development.scm24
1 files changed, 13 insertions, 11 deletions
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 3ff27b4a1b..61943e8ed5 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -233,10 +233,19 @@ PCM data.")
(base32
"13j1m92zhxwkaaja3lg5x0h0b28mrrawdzk9d3hd19031akfxwb3"))))
(build-system gnu-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'build 'no-Werror
+ (lambda _
+ ;; Don't abort builds due to things like GLib
+ ;; deprecation warnings.
+ (substitute* (find-files "." "^Makefile\\.in$")
+ (("-Werror") ""))
+ #t)))))
(native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("bdb" ,bdb)
("glib" ,glib)
- ("guile" ,guile-2.0)
+ ("guile" ,guile-2.2)
("libmicrohttpd" ,libmicrohttpd)
("ncurses" ,ncurses)
("sdl" ,sdl)
@@ -541,22 +550,15 @@ archive on a per-file basis.")
(define-public love
(package
(name "love")
- (version "0.10.2")
+ (version "11.1")
(source (origin
(method url-fetch)
(uri (string-append "https://bitbucket.org/rude/love/downloads/"
"love-" version "-linux-src.tar.gz"))
(sha256
(base32
- "11x346pw0gqad8nmkmywzx4xpcbfc3dslbrdw5x94n1i25mk0sxj"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Build with luajit 2.1.0-beta3. Fixed in love 0.11.
- ;; See <https://bitbucket.org/rude/love/issues/1277>.
- (substitute* "src/libraries/luasocket/libluasocket/lua.h"
- (("> 501") ">= 501"))
- #t))))
+ "1pkwiszmjs0xrwk0wqbc5cp9108b1y8gwsid0gqk1s0x09q9lpmw"))
+ (modules '((guix build utils)))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))