From patchwork Thu Aug 24 04:15:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53170 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 0777E27BBEC; Thu, 24 Aug 2023 05:16:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 98A2C27BBE2 for ; Thu, 24 Aug 2023 05:16:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ1lK-0007Hm-8q; Thu, 24 Aug 2023 00:16:02 -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 1qZ1lI-0007HW-5A for guix-patches@gnu.org; Thu, 24 Aug 2023 00:16:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ1lH-0005bE-R0 for guix-patches@gnu.org; Thu, 24 Aug 2023 00:15:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZ1lK-0004V9-HS for guix-patches@gnu.org; Thu, 24 Aug 2023 00:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH 36/61] gnu: metapixel: Rewrite with G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 04:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169285053317248 (code B ref 65479); Thu, 24 Aug 2023 04:16:02 +0000 Received: (at 65479) by debbugs.gnu.org; 24 Aug 2023 04:15:33 +0000 Received: from localhost ([127.0.0.1]:35784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1kq-0004U7-UF for submit@debbugs.gnu.org; Thu, 24 Aug 2023 00:15:33 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:39630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1kl-0004Tv-8a for 65479@debbugs.gnu.org; Thu, 24 Aug 2023 00:15:31 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 2DCAF20533 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4909F80098 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zq3-AfL1nJHq for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:20 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 95CBD80097 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:20 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 05:15:20 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image-processing.scm (metapixel)[arguments]: Rewrite with G-Expressions. [inputs, native-inputs]: Drop labels. --- gnu/packages/image-processing.scm | 44 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index e3c3bf56bf..1b025a6d61 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1509,30 +1509,30 @@ (define-public metapixel (sha256 (base32 "0r7n3a6bvcxkbpda4mwmrpicii09iql5z69nkjqygkwxw7ny3309")))) (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; No tests. + #:make-flags + #~(list + (string-append "PREFIX=" #$output) + (format #f "MANPAGE_XSL=~a/xml/xsl/~a-~a/manpages/docbook.xsl" + #$(this-package-native-input "docbook-xsl") + #$(package-name + (this-package-native-input "docbook-xsl")) + #$(package-version + (this-package-native-input "docbook-xsl")))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'fix-directory-creation + (lambda _ + (mkdir-p (string-append #$output "/share/man/man1"))))))) (inputs - `(("giflib" ,giflib) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("perl" ,perl))) + (list giflib libjpeg-turbo libpng + perl)) (native-inputs - `(("pkg-config" ,pkg-config) - ("docbook-xml" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("xsltproc" ,libxslt))) - (arguments - `(#:tests? #f ; No tests. - #:make-flags (list - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "MANPAGE_XSL=" - (assoc-ref %build-inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-*/manpages/docbook.xsl")) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'fix-directory-creation - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "out") "/share/man/man1")) - #t))))) + (list docbook-xml-4.2 docbook-xsl + libxslt pkg-config)) (home-page "https://www.complang.tuwien.ac.at/schani/metapixel/") (synopsis "Photomosaics generator") (description "Metapixel is a program for generating photomosaics. It can