From patchwork Wed Jun 26 12:51:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 14399 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EFB5417168; Wed, 26 Jun 2019 13:53:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D0B7A17160 for ; Wed, 26 Jun 2019 13:53:15 +0100 (BST) Received: from localhost ([::1]:39908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hg7QG-0007GT-GW for patchwork@mira.cbaines.net; Wed, 26 Jun 2019 08:53:12 -0400 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-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2019 12:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 36197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Amar Singh Mail-Followup-To: 36197@debbugs.gnu.org, ludo@gnu.org, nly@disroot.org Received: via spool by 36197-done@debbugs.gnu.org id=D36197.156155350914545 (code D ref 36197); Wed, 26 Jun 2019 12:52:02 +0000 Received: (at 36197-done) by debbugs.gnu.org; 26 Jun 2019 12:51:49 +0000 Received: from localhost ([127.0.0.1]:34467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg7Or-0003mT-G4 for submit@debbugs.gnu.org; Wed, 26 Jun 2019 08:51:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hg7On-0003mC-0l for 36197-done@debbugs.gnu.org; Wed, 26 Jun 2019 08:51:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hg7Oe-0002H9-JU; Wed, 26 Jun 2019 08:51:33 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35694 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hg7Oe-0005uh-27; Wed, 26 Jun 2019 08:51:32 -0400 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 36197-done@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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’. 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))))