guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: pioneer: Update to 20190203.


From: guix-commits
Subject: 01/01: gnu: pioneer: Update to 20190203.
Date: Mon, 14 Oct 2019 21:45:13 -0400 (EDT)

bavier pushed a commit to branch master
in repository guix.

commit ed3e7b7213ae7432ae49516ebb567b46c347fb48
Author: Eric Bavier <address@hidden>
Date:   Mon Oct 14 20:33:19 2019 -0500

    gnu: pioneer: Update to 20190203.
    
    * gnu/packages/games.scm (pioneer): Update to 20190203.
    [build-system]: Switch from gnu- to cmake-build-system.
    [native-inputs]: Remove autoconf and automake.
    [inputs]: Add glew.
    [arguments]: Adjust configure-flags for cmake.  Remove phase modification.
---
 gnu/packages/games.scm | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2ed505b..a5b8ee9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013 John Darrington <address@hidden>
 ;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2016 David Thompson <address@hidden>
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Eric Bavier <address@hidden>
 ;;; Copyright © 2014 Cyrill Schenkel <address@hidden>
 ;;; Copyright © 2014 Sylvain Beucler <address@hidden>
 ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès <address@hidden>
@@ -5514,7 +5514,7 @@ elements to achieve a simple goal in the most complex way 
possible.")
 (define-public pioneer
   (package
     (name "pioneer")
-    (version "20180203")
+    (version "20190203")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5523,16 +5523,15 @@ elements to achieve a simple goal in the most complex 
way possible.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"))))
-    (build-system gnu-build-system)
+                "1g34wvgyvz793dhm1k64kl82ib0cavkbg0f2p3fp05b457ycljff"))))
+    (build-system cmake-build-system)
     (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("assimp" ,assimp)
        ("curl" ,curl)
        ("freetype" ,freetype)
+       ("glew" ,glew)
        ("glu" ,glu)
        ("libpng" ,libpng)
        ("libsigc++" ,libsigc++)
@@ -5542,16 +5541,9 @@ elements to achieve a simple goal in the most complex 
way possible.")
        ("sdl" ,(sdl-union (list sdl2 sdl2-image)))))
     (arguments
      `(#:tests? #f                      ;tests are broken
-       #:configure-flags (list "--with-external-liblua"
-                               (string-append "PIONEER_DATA_DIR="
-                                              %output "/share/games/pioneer"))
-       #:phases (modify-phases %standard-phases
-                  (add-before 'bootstrap 'fix-lua-check
-                    (lambda _
-                      (substitute* "configure.ac"
-                        (("lua5.2")
-                         (string-append "lua-" ,(version-major+minor
-                                                 (package-version 
lua-5.2))))))))))
+       #:configure-flags (list "-DUSE_SYSTEM_LIBLUA:BOOL=YES"
+                               (string-append "-DPIONEER_DATA_DIR="
+                                              %output 
"/share/games/pioneer"))))
     (home-page "http://pioneerspacesim.net";)
     (synopsis "Game of lonely space adventure")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]