unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 64287@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>,
	Andreas Enge <andreas@enge.fr>,
	Efraim Flashner <efraim@flashner.co.il>,
	Eric Bavier <bavier@posteo.net>
Subject: [bug#64287] [PATCH 9/9] gnu: celestia-gtk: Fix build.
Date: Sun, 25 Jun 2023 22:28:21 +0100	[thread overview]
Message-ID: <76b42eb0eea478c61da9215fc5b2e1b7fa1c078d.1687727967.git.sharlatanus@gmail.com> (raw)
In-Reply-To: <cover.1687727967.git.sharlatanus@gmail.com>

* 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





  parent reply	other threads:[~2023-06-25 21:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-25 21:26 [bug#64287] [PATCH 0/9]: gnu: Monthly astronomy packages update II Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 1/9] gnu: weightwatcher: Fix build Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 2/9] gnu: swarp: Update to 2.41.2, fix build Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 3/9] gnu: eye: Fix build Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 4/9] gnu: missfits: " Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 5/9] gnu: skymaker: Update to 3.10.5-0.1a69c47, fix build Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 6/9] gnu: stuff: Update to 1.26.0-0.9008dc0, " Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 7/9] gnu: xplanet: Use G-expressions Sharlatan Hellseher
2023-06-25 21:28 ` [bug#64287] [PATCH 8/9] gnu: celestia: Update to 1.6.3 Sharlatan Hellseher
2023-06-25 21:28 ` Sharlatan Hellseher [this message]
2023-07-04 13:07 ` [bug#64287] Sharlatan Hellseher
2023-07-08 18:56   ` [bug#64287] Sharlatan Hellseher
2023-07-08 19:19     ` [bug#64287] Tobias Geerinckx-Rice via Guix-patches via
2023-07-09  8:41     ` [bug#64287] Sharlatan Hellseher
2023-07-09  8:30 ` bug#64287: Sharlatan Hellseher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=76b42eb0eea478c61da9215fc5b2e1b7fa1c078d.1687727967.git.sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=64287@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).