[bug#58920] [PATCH 0/2] Update endless-sky

[bug#58920] [PATCH 0/2] Update endless-sky

[Timotej Lazar]

Hi,

this updates endless-sky to 0.9.16.1 and changes it to the new style. I
modified the scons build-system to allow passing a G-exp for flags. 

I checked that other packages using scons-build-system still build
(except aria-maestosa, which didn’t build before).

Thanks!

Timotej Lazar (2):
  build-system/scons: Allow using a G-exp for scons-flags.
  gnu: endless-sky: Update to 0.9.16.1, use new package style.

 gnu/packages/games.scm      | 46 ++++++++++++++++++-------------------
 guix/build-system/scons.scm |  4 +++-
 2 files changed, 26 insertions(+), 24 deletions(-)


base-commit: ab974ed709976d34917c8f6f9e5cc0004547af45
-- 
2.38.0

[bug#58920] [PATCH 1/2] build-system/scons: Allow using a G-exp for scons-flags.

[Timotej Lazar]

* guix/build-system/scons.scm (scons-build): Only call sexp->gexp on
scons-flags when scons-flags is a pair.
---
 guix/build-system/scons.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm
index e38213e8e0..7a02fa8a0f 100644
--- a/guix/build-system/scons.scm
+++ b/guix/build-system/scons.scm
@@ -100,7 +100,9 @@ (define builder
           #$(with-build-variables inputs outputs
               #~(scons-build #:name #$name
                              #:source #+source
-                             #:scons-flags #$(sexp->gexp scons-flags)
+                             #:scons-flags #$(if (pair? scons-flags)
+                                                 (sexp->gexp scons-flags)
+                                                 scons-flags)
                              #:system #$system
                              #:build-targets #$build-targets
                              #:test-target #$test-target
-- 
2.38.0

[bug#58920] [PATCH 2/2] gnu: endless-sky: Update to 0.9.16.1, use new package style.

[Timotej Lazar]

* gnu/packages/games.scm (endless-sky): Update to 0.9.16.1.
[arguments]: Use G-expressions. Drop #:scons to use the default version.
[inputs]: Remove labels. Add util-linux:lib.
---
 gnu/packages/games.scm | 46 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 56d4ad2d87..a04cb0462d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8275,7 +8275,7 @@ (define-public quadrapassel
 (define-public endless-sky
   (package
     (name "endless-sky")
-    (version "0.9.14")
+    (version "0.9.16.1")
     (source
      (origin
        (method git-fetch)
@@ -8284,31 +8284,31 @@ (define-public endless-sky
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12iganf8dxiyrjznnabsarxjsr0h717j3k4mz15p0k67wxyahhmf"))))
+        (base32 "0cb2g1cb0mk6x9gq2x7n10rxlfhsq8wnssk068j6h80al3hhybly"))))
     (build-system scons-build-system)
     (arguments
-     `(#:scons ,scons-python2
-       #:scons-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; Look for resources in the store directory.
-             (substitute* "source/Files.cpp"
-               (("/usr/local") (assoc-ref outputs "out")))
-             ;; Install game binary into %out/bin.
-             (substitute* "SConstruct"
-               (("games\"") "bin\""))))
-         (add-before 'build 'use-gcc-ar
-           ;; Use gcc-ar to support LTO.
-           (lambda _ (setenv "AR" "gcc-ar"))))))
+     (list #:scons-flags #~(list (string-append "PREFIX=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-paths
+                 (lambda _
+                   ;; Look for resources in the store directory.
+                   (substitute* "source/Files.cpp"
+                     (("/usr/local") #$output))
+                   ;; Install game binary into %out/bin.
+                   (substitute* "SConstruct"
+                     (("games\"") "bin\""))))
+               (add-before 'build 'use-gcc-ar
+                 ;; Use gcc-ar to support LTO.
+                 (lambda _ (setenv "AR" "gcc-ar"))))))
     (inputs
-     `(("glew" ,glew)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libmad" ,libmad)
-       ("libpng" ,libpng)
-       ("openal" ,openal)
-       ("sdl2" ,sdl2)))
+     (list glew
+           libjpeg-turbo
+           libmad
+           libpng
+           openal
+           sdl2
+           `(,util-linux "lib"))) ; for libuuid
     (home-page "https://endless-sky.github.io/")
     (synopsis "2D space trading and combat game")
     (description "Endless Sky is a 2D space trading and combat game.  Explore
-- 
2.38.0

[bug#58920] [PATCH 0/2] Update endless-sky

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 770 bytes --]


Timotej Lazar <timotej.lazar@araneo.si> writes:

> this updates endless-sky to 0.9.16.1 and changes it to the new style. I
> modified the scons build-system to allow passing a G-exp for flags.
>
> I checked that other packages using scons-build-system still build
> (except aria-maestosa, which didn’t build before).
>
> Thanks!
>
> Timotej Lazar (2):
>   build-system/scons: Allow using a G-exp for scons-flags.
>   gnu: endless-sky: Update to 0.9.16.1, use new package style.
>
>  gnu/packages/games.scm      | 46 ++++++++++++++++++-------------------
>  guix/build-system/scons.scm |  4 +++-
>  2 files changed, 26 insertions(+), 24 deletions(-)

Awesome, I've pushed to master as
0e392dc35cb350f6f0986d816e315d2e38cdef78.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]