GNU bug report logs - #64287
[PATCH 0/9]: gnu: Monthly astronomy packages update II.

Previous Next

Package: guix-patches;

Reported by: Sharlatan Hellseher <sharlatanus <at> gmail.com>

Date: Sun, 25 Jun 2023 21:27:01 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 64287 <at> debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>, Andreas Enge <andreas <at> enge.fr>, Efraim Flashner <efraim <at> flashner.co.il>, Eric Bavier <bavier <at> posteo.net>
Subject: [bug#64287] [PATCH 9/9] gnu: celestia-gtk: Fix build.
Date: Sun, 25 Jun 2023 22:28:21 +0100
* gnu/packages/astronomy.scm (celestia-gtk): Fix build.
Use (package/inherit ...) over (inherit ...), see
https://issues.guix.gnu.org/issue/61674/raw/11.
[arguments]: Use G-expressions.
[inputs]: Swap to (modify-inputs ...) procedure. Add cairo, libxmu,
libtheora, pango-1.42.
---
 gnu/packages/astronomy.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index af75d493f6..ca32ad8950 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1182,18 +1182,21 @@ (define-public celestia
 accurately in real time at any rate desired.")
     (license license:gpl2+)))
 
-
 (define-public celestia-gtk
-  (package
-    (inherit celestia)
+  (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))))
+     (list
+      #:configure-flags
+      #~(list "--enable-cairo"
+              "--enable-theora"
+              "--with-gtk"
+              (string-append "--with-lua=" #$(this-package-input "lua")))))
+    (inputs
+     (modify-inputs (package-inputs celestia)
+       (replace "freeglut" gtk+-2)
+       (prepend cairo gtkglext libxmu libtheora pango-1.42)))
+    (synopsis "GTK+ build for the Celestia package.")))
 
 (define-public python-astropy
   (package
-- 
2.40.1





This bug report was last modified 1 year and 304 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.