bug#36197: [Patch] gnu: add celestia; celestia-gtk

[Ludovic Courtès]

Hi Amar,

Amar Singh <address@hidden> skribis:

>>From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001
> From: Amar Singh <address@hidden>
> Date: Sun, 19 May 2019 12:39:48 +0530
> Subject: [PATCH 1/2] gnu: Add celestia.
>
> * gnu/packages/astronomy.scm (celestia): New variable.

I fixed the license as swedebugia noted, made the minor cosmetic changes
shown below, and applied.

>>From c8dd3c6871da910761ea8908f6bc9866c7f3c5ac Mon Sep 17 00:00:00 2001
> From: Amar Singh <address@hidden>
> Date: Thu, 13 Jun 2019 22:53:22 +0530
> Subject: [PATCH 2/2] gnu: Add celestia-gtk.
>
> * gnu/packages/astronomy.scm (celestia-gtk): New variable.

Applied with the changes below.

Thank you!

Ludo’.

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 20639bc779..59fa11bfda 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 John Darrington <address@hidden>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018, 2019 Efraim Flashner <address@hidden>
-;;; Copyright © 2019 by Amar Singh<address@hidden>
+;;; Copyright © 2019 by Amar Singh <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -189,20 +189,16 @@ objects.")
   (let ((commit "9dbdf29c4ac3d20afb2d9a80d3dff241ecf81dce"))
     (package
       (name "celestia")
-      (version
-       (git-version "1.6.1" "815" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url
-            "https://github.com/celestiaproject/celestia";)
-           (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78"))))
+      (version (git-version "1.6.1" "815" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/celestiaproject/celestia";)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "00xibg87l1arzifakgj7s828x9pszcgx7x7ij88a561ig49ryh78"))))
       (build-system cmake-build-system)
       (native-inputs
        `(("perl" ,perl)
@@ -227,14 +223,14 @@ objects.")
        `(("lua" ,lua)))
       (arguments
        `(#:configure-flags '("-DENABLE_GLUT=ON" "-DENABLE_QT=OFF")
-         #:tests? #f))
+         #:tests? #f))                            ;no tests
       (home-page "https://celestia.space/";)
       (synopsis "Real-time 3D visualization of space")
       (description
-       "The free space simulation that lets you explore our universe in three
+       "This simulation program lets you explore our universe in three
 dimensions.  Celestia simulates many different types of celestial objects.
 From planets and moons to star clusters and galaxies, you can visit every
 object in the expandable database and view it from any point in space and
 time.  The position and movement of solar system objects is calculated
 accurately in real time at any rate desired.")
-      (license license:gpl2))))
+      (license license:gpl2+))))

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index df801ef444..81c7481e0b 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -42,7 +42,8 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages maths)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (srfi srfi-1))
 
 (define-public cfitsio
   (package
@@ -238,15 +239,13 @@ accurately in real time at any rate desired.")
       (license license:gpl2+))))
 
 (define-public celestia-gtk
-  (package (inherit celestia)
-           (name "celestia-gtk")
-           (version (package-version celestia))
-           (inputs
-            (append (filter (lambda (x)
-                              (not (equal? (car x) "freeglut")))
-                            (package-inputs celestia))
-                    `(("gtk2" ,gtk+-2)
-                      ("gtkglext" ,gtkglext))))
-           (arguments
-            `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
-              #:tests? #f))))
+  (package
+    (inherit celestia)
+    (name "celestia-gtk")
+    (inputs
+     (append (alist-delete "freeglut" (package-inputs celestia))
+             `(("gtk2" ,gtk+-2)
+               ("gtkglext" ,gtkglext))))
+    (arguments
+     `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF")
+       #:tests? #f))))