From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QFBUAsWxmGQaWQEASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 23:29:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AKJWAsWxmGTYugAA9RJhRA (envelope-from ) for ; Sun, 25 Jun 2023 23:29:41 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B31AA10FF4 for ; Sun, 25 Jun 2023 23:29:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIY-0000UF-Ob; Sun, 25 Jun 2023 17:29:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDXIA-0008PF-4P for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDXI9-0003r8-SA for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI8-0004qw-RU; Sun, 25 Jun 2023 17:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 9/9] gnu: celestia-gtk: Fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 21:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64287@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64287-submit@debbugs.gnu.org id=B64287.168772852318544 (code B ref 64287); Sun, 25 Jun 2023 21:29:04 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:43 +0000 Received: from localhost ([127.0.0.1]:43818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHm-0004ox-Mp for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:43 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:42094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHf-0004nG-Bk for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:35 -0400 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3fa79605a3bso21716805e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728509; x=1690320509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fMe1sarz8VFh3s/sAKiwEOGBYKyQBzUSTY9QpTMqxrw=; b=ObidDPTGvY6hcBjzCdVAtICrkWH8q5yIJrp+CL1gltT4esXmS+9EMkLkiuk8ouP/Ai iUS1/x4A37ANMSH5kgd3yWWCTnGET9vLnwP+Q5InEErN9da8ZpCan3oPQ5am9CGT5UHI sB+kqBnF+J7zh5K8r+9cWBmxqO/7XPhf8IIpKihSdrO6EdaoDTfdjDuCk5RXB7Ugm/u8 nPNrgfBJyJ+rvwgfpeHft/+lnUBWMgk8cWXL5Cs8sI1I6d2S+DKXWrYS+34MtHHcqZgg AsY5CjsKoCOt3wlThdzpW7bXcRrx1ybwOhJ2zU612D7frFFStsz1WHQTmUd6xHmnf5NY Yf5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728509; x=1690320509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMe1sarz8VFh3s/sAKiwEOGBYKyQBzUSTY9QpTMqxrw=; b=fp4SS5oRMDNZDGUFAt+kc8x6Z8XubCOmGV4plhaE3OJiR7vi2UncHyof+h0KEqil7X WjMq7Om0vH+HMWOtVStBrz1/TnnvTyUufwmR/nrzvHj2eBK41mhCzkRV86EROXa2LIok CG34gkIJOWguUDqC300hXtxSy+cjVwcAGdCZRVXkfcatJKeV1NPntJlssrS2rcmt0Rwo /xWG8UecB6ZBiuDEhguLSAc4JiZTsz8hr51oCsdLzsYxDG6vOTmRReyOKJPC4XpsAVOP 0AZ3PNGwyiwd17X7zaDd0HZQjgw8gsrMAq9O+txTJaqc+yOzeefoce3A0+Pp0vGvG73H YJgg== X-Gm-Message-State: AC+VfDxA5jQnfd/iaub/Pm8irlb1J4GS8K2fL6CWo7yZddMDCEzA9zEL VBDpi8TDzdHbsQFEav3KmNBW6kKOZjo= X-Google-Smtp-Source: ACHHUZ65fJ8nlkJPFBBLnaI0nvMvpTjikWL9VzcfmVXgaPagthvDIRD0XRs3bGydyUxS5XhvoY6+aw== X-Received: by 2002:a1c:f616:0:b0:3f6:d90:3db with SMTP id w22-20020a1cf616000000b003f60d9003dbmr24529510wmc.3.1687728509650; Sun, 25 Jun 2023 14:28:29 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id o23-20020a05600c379700b003f8f884ebe5sm5766923wmr.2.2023.06.25.14.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:29 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:21 +0100 Message-Id: <76b42eb0eea478c61da9215fc5b2e1b7fa1c078d.1687727967.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687728580; a=rsa-sha256; cv=none; b=bRwafZDBIYI9sUXD6regV7uKpeuPqmbNitT06Czii+GRXF251a339PlVE3WVnpreNiZQA0 ewS0AXERDrVz9g5TYwWzLtJcsPIHaeKwUBgFjr45P2UuIrk7jaV9Sbumb1JcR8/gOUD36u rC35j0TopY0Vuw5CAxsokDYLCym3wSt3AAOC77bw8e3LOTYPuyDE/SjdBEVkH4pxDR+jeO YCCYCyMxNqYcpnbRAL4IknOt6+42w5LitQLlWUcM9pX/Wzb+crDlLC8+bS1fnsrTll0j4V 1kaSrUxLQkgQQtEDruNUaYXefcCG37GxcIHol/6Lb1rmtadcOCA93CJbxgpoDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ObidDPTG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687728580; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=fMe1sarz8VFh3s/sAKiwEOGBYKyQBzUSTY9QpTMqxrw=; b=cKf/X0MKhwfyWzKzuI19eLTnfa+MI+AfmVHsw+mlFemKtgYWfsheOsOEBM9jBkkBIEe6Og VwvYtt1TMbcJJ06DYgQF4QdDnXnqmS3Qxue/evCk33WckcAg+b/DXLB6ZOy9Xwa+zy3rd5 ttQ330c9On9f05r0X3zE/UL2SloYpB2/lU0Y7qxKUaLAe/x5+ITERjvhFvOCXhvgEW0H87 OpMka8pr5W7ReC8qVgoBX6TD27WjU+vzuy7Uh0SGBDVWtS9A9LKITY7j5FN881pL6WBNs4 xjQ3xheq0GqL9ilfHRzcri0RSlCC4EYdH8d1ZiK+YuJ1E9RtuzMCwXWI1WX6+g== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ObidDPTG; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.65 X-Spam-Score: -0.65 X-Migadu-Queue-Id: B31AA10FF4 X-TUID: 1VbNvVEBkYcl * 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