> From 1991208b15a9a304224091c09dd80d01862d3e36 Mon Sep 17 00:00:00 2001 From: Adonay Felipe Nogueira Date: Sat, 14 Jan 2017 16:42:05 -0200 Subject: [PATCH] gnu: abbaye: Update to 2.0.1 from new repository. * gnu/packages/games.scm: (abbaye): Update to 2.0.1. --- gnu/packages/games.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c449f59..272fa0f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Steve Webber +;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira ;;; ;;; This file is part of GNU Guix. ;;; @@ -176,22 +177,24 @@ scriptable with Guile.") (define-public abbaye (package (name "abbaye") - (version "1.13") + (version "2.0.1") (source (origin - (method url-fetch) - (uri (string-append "https://storage.googleapis.com/" - "google-code-archive-downloads/v2/code.google.com/" - "abbaye-for-linux/abbaye-for-linux-src-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://github.com/nevat/abbayedesmorts-gpl.git") + (commit (string-append "v" version)))) (sha256 (base32 - "1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk")))) + "1pwqf7r9bqb2p3xrw9i7y8pgr1401fy3mnnqpb1qkhmdl3gqi9hb")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Unbundle fonts. + (delete-file-recursively "fonts"))))) (build-system gnu-build-system) (arguments - '(#:modules ((ice-9 match) - (guix build gnu-build-system) - (guix build utils)) + '(#:make-flags '("CC=gcc") #:phases (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) @@ -199,12 +202,10 @@ scriptable with Guile.") (string-append (assoc-ref inputs "sdl-union") "/include/SDL")))) (add-after 'patch-source-shebangs 'patch-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; Replace /usr with package output directory. - (for-each (lambda (file) - (substitute* file - (("/usr") (assoc-ref outputs "out")))) - '("makefile" "src/pantallas.c" "src/comun.h")))) + (lambda* (#:key outputs #:allow-other-keys) + ;; Replace /usr with package output directory + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))))) (add-before 'install 'make-install-dirs (lambda* (#:key outputs #:allow-other-keys) (let ((prefix (assoc-ref outputs "out"))) @@ -216,15 +217,15 @@ scriptable with Guile.") (delete 'configure)) #:tests? #f)) ;; No check target. (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("sdl-union" ,(sdl-union)))) - (home-page "http://code.google.com/p/abbaye-for-linux/") + (inputs `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer))))) + (home-page "https://github.com/nevat/abbayedesmorts-gpl") (synopsis "GNU/Linux port of the indie game \"l'Abbaye des Morts\"") (description "L'Abbaye des Morts is a 2D platform game set in 13th century France. The Cathars, who preach about good Christian beliefs, were being expelled by the Catholic Church out of the Languedoc region in France. One of them, called Jean Raymond, found an old church in which to hide, not knowing that beneath its ruins lay buried an ancient evil.") - (license license:gpl3+))) + (license license:gpl3))) (define-public pingus (package -- 1.9.1