From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58884) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg7PD-00053O-Ed for guix-patches@gnu.org; Wed, 26 Jun 2019 08:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hg7PB-0002pi-Rq for guix-patches@gnu.org; Wed, 26 Jun 2019 08:52:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49157) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hg7P8-0002m4-JT for guix-patches@gnu.org; Wed, 26 Jun 2019 08:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hg7P8-0003n2-Go for guix-patches@gnu.org; Wed, 26 Jun 2019 08:52:02 -0400 Subject: bug#36197: [Patch] gnu: add celestia; celestia-gtk Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <855zp9gxna.fsf@disroot.org> Date: Wed, 26 Jun 2019 14:51:29 +0200 In-Reply-To: <855zp9gxna.fsf@disroot.org> (Amar Singh's message of "Thu, 13 Jun 2019 23:45:05 +0530") Message-ID: <87y31oik6m.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Amar Singh Cc: 36197-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Amar, Amar Singh skribis: >>>From dba590074e9a0c7cf3dc8440492190de732feaea Mon Sep 17 00:00:00 2001 > From: Amar Singh > 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 > 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=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 =C2=A9 2016 John Darrington ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018, 2019 Efraim Flashner -;;; Copyright =C2=A9 2019 by Amar Singh +;;; Copyright =C2=A9 2019 by Amar Singh ;;; ;;; 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=3DON" "-DENABLE_QT=3DOFF") - #: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 th= ree + "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+)))) --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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)))) --=-=-=--