From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ALPBCA+ymGQmDAAASxT56A (envelope-from ) for ; Sun, 25 Jun 2023 23:30:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mHvaBw+ymGScqgAAG6o9tA (envelope-from ) for ; Sun, 25 Jun 2023 23:30:55 +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 BB017E1B0 for ; Sun, 25 Jun 2023 23:30:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDXIW-0000MZ-Ai; Sun, 25 Jun 2023 17:29:28 -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 1qDXI8-0008PB-OX 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 1qDXI8-0003qo-GH for guix-patches@gnu.org; Sun, 25 Jun 2023 17:29:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDXI8-0004ql-Bn; Sun, 25 Jun 2023 17:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64287] [PATCH 7/9] gnu: xplanet: Use G-expressions. 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.168772852218538 (code B ref 64287); Sun, 25 Jun 2023 21:29:04 +0000 Received: (at 64287) by debbugs.gnu.org; 25 Jun 2023 21:28:42 +0000 Received: from localhost ([127.0.0.1]:43816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHm-0004op-BL for submit@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:42 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:60648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDXHd-0004nD-RX for 64287@debbugs.gnu.org; Sun, 25 Jun 2023 17:28:35 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fa798cf204so43207895e9.0 for <64287@debbugs.gnu.org>; Sun, 25 Jun 2023 14:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687728508; x=1690320508; 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=rQlj97iviQg6+nBD40kQs+WIiXtADHLDKL1BSmmC96Q=; b=M14hscFHeYCjlmwBk6563/rx8yGKZNI6bxgZ/Zm8tJV2EQoFKPlGSQ56dZ5xw/WXr2 1gQtpbze0zleC/PR0sBNJCW5RyqtQ11Y0Hx0MpU1iRH+3mY7i5rhThRZxFUW9oSRr45s sAzw+mg2JarZeQw+ZHzWzps1xxHajDpNeRag2WHSm13oeMRF07ywULYgK+n8ZF68+nno vkMBBRWv4lMJ+/aQWmEenwK9L2MPRTCn32bU9rQtuDjZAzADXMB/J7gNFC6Ba3VqMuzp ry9/BbLa/zOo8roLzgyzvOgpUXwRHeHMyKz/3AZxos2tDrS2hybenbscgLfQN1Q2THF6 qSuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687728508; x=1690320508; 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=rQlj97iviQg6+nBD40kQs+WIiXtADHLDKL1BSmmC96Q=; b=ReID8WpD+/jsE3w/WIeNe4RI7Kb7sQw0Fs+z2hlcebkHiEOrvsGxbMCNR3kMxuFd+q i2drVyr4gH2d4igXeNQhn/ZRzl5PqMw9PpXisDJseZ05tUR5j0WGJ3L4hWfOsjdn5QLN b1vNspIB5VeIIrU5EHcm7tZB7iGEiSN1CY34UxsXZO2eKEta47CgCJMcisxdUpXb8Akv OwQSCYNjaFMKqXwvfjr13nFGH7xybNsVcVOExTq+u6r0evjpUp07BiII+o3rb2Jnp6HB AtXdhz2SB6W2qgHyL2/vT7Po/wBfNG+la0in+tET0SlmLftn3CNPUPLEhT1fL07yQV31 RtJw== X-Gm-Message-State: AC+VfDy2y1ccvd0IeQTACl9ZH+18mca5ceC/+ycrCGak2/rd60HGODHV EKrISd+1lf+jzyO5iSg7lU934vpAZcM= X-Google-Smtp-Source: ACHHUZ6+86cIDbAJ4h5co5Enbv+5+kEsqdoXomzI9M0IPvCtEKfyUvagqUPZPdvkxnxU4g0xxQnIPQ== X-Received: by 2002:a1c:f603:0:b0:3f8:f80e:7b64 with SMTP id w3-20020a1cf603000000b003f8f80e7b64mr30259825wmc.17.1687728508251; Sun, 25 Jun 2023 14:28:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 14:28:27 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 25 Jun 2023 22:28:19 +0100 Message-Id: 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687728654; 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=rQlj97iviQg6+nBD40kQs+WIiXtADHLDKL1BSmmC96Q=; b=c2/A/YoR8lyxfavhWx5xvkxo0nrn89NOy/VpCTIFvNLu3xztiCruIJ9XdG58uGDyEaMc7r iRVctkmRjQqomf+4E9yN/6TFl76gBiKUHBsl0njuDKdJEZLIKwCXX/oDwPikeYF8/x9ifS HYxsv8inIcRzyXM30DHf3omQ1JfuASXw7I1eqMbVQXhIpbJHhWndX0LrqrLW1BWXRVOoNB pny0pwcJ37qxnz60FehFurw9lvgg+gAeHuDJ6gCY6uBLqgCU9w+wgOiKS2J3refnu2crvY A/wYUfexiWfPE8ohjXPfYG6p3qPZ9jy1QuSPgIysdETRg0dvkRMJMa7Qrjiz/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=M14hscFH; 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-Seal: i=1; s=key1; d=yhetil.org; t=1687728654; a=rsa-sha256; cv=none; b=tNd+NZtCHMFFaqlaSZ06vReti6Oss+2lnandzd14Zw4c5z+aP0aetYScHyCNUY51LdvigP 4hxjLA/+H6wuZWk+KxABe5yqd7HJDipeNHqFJ1rN3EMz98Ij3g180H2sH6+kAzrddxqa05 2disDzL4QdhBMtnV5Te+7zEPAp3ibxxk43/07hxmGcDLPMpPHlkja9SU9VCkKwTnvb7TpF qy19wfSytxj8MjbmTOEAy/Wg+08SHTrKAmsbI7sZb1uxVCSfBZt1LS90ty9w7Ri+zmcFWz mzQ3V1EMqjJWyUJZGe+J9KcAFGVGikSas+YVc3my+fADiDNpQcv92/nUW4L0SA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=M14hscFH; 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-Queue-Id: BB017E1B0 X-Spam-Score: -0.65 X-TUID: Ys8GYZ37H55R * gnu/packages/astronomy.scm (xplanet): Use G-expressions, improve package style. [inputs]: Remove labels. --- gnu/packages/astronomy.scm | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 310a6340f5..b212f4614f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2720,28 +2720,29 @@ (define-public xplanet "xplanet-1.3.1-libimage_gif.c.patch" "xplanet-1.3.1-xpUtil-Add2017LeapSecond.cpp.patch")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list + ;; no nasa jpl cspice support + "--without-cspice" + ;; Give correct path for pnm.h header to configure script + (string-append + "CPPFLAGS=-I" #$(this-package-input "netpbm") "/include/netpbm")))) (native-inputs (list pkg-config)) (inputs - `(("libx11" ,libx11) - ("libxscrnsaver" ,libxscrnsaver) - ("libice" ,libice) - ("freetype" ,freetype) - ("pango" ,pango) - ("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("netpbm" ,netpbm) - ("zlib" ,zlib))) - (arguments - `(#:configure-flags - (let ((netpbm (assoc-ref %build-inputs "netpbm"))) - (append (list - ;; Give correct path for pnm.h header to configure script - (string-append "CPPFLAGS=-I" netpbm "/include/netpbm") - ;; no nasa jpl cspice support - "--without-cspice" ))))) + (list libx11 + freetype + giflib + libice + libjpeg-turbo + libpng + libtiff + libxscrnsaver + netpbm + pango + zlib)) (home-page "https://xplanet.sourceforge.net/") (synopsis "Planetary body renderer") (description -- 2.40.1