From patchwork Sun Jul 14 07:42:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 29279 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 653F327BBEC; Sun, 14 Jul 2024 08:44:46 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 D338127BBE2 for ; Sun, 14 Jul 2024 08:44:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sStts-0007da-6z; Sun, 14 Jul 2024 03:44:04 -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 1sSttq-0007cT-9Z for guix-patches@gnu.org; Sun, 14 Jul 2024 03:44:02 -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 1sSttq-00035m-12 for guix-patches@gnu.org; Sun, 14 Jul 2024 03:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSttr-0003ae-8R for guix-patches@gnu.org; Sun, 14 Jul 2024 03:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v2 3/5] gnu: fastfetch: Add more configure flags. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 07:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71968@debbugs.gnu.org Cc: Dariqq Received: via spool by 71968-submit@debbugs.gnu.org id=B71968.172094303113741 (code B ref 71968); Sun, 14 Jul 2024 07:44:03 +0000 Received: (at 71968) by debbugs.gnu.org; 14 Jul 2024 07:43:51 +0000 Received: from localhost ([127.0.0.1]:57080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sStte-0003ZY-VH for submit@debbugs.gnu.org; Sun, 14 Jul 2024 03:43:51 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sStta-0003YZ-M7 for 71968@debbugs.gnu.org; Sun, 14 Jul 2024 03:43:47 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id AE52C240103 for <71968@debbugs.gnu.org>; Sun, 14 Jul 2024 09:43:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1720943019; bh=Mxuj8DDP6yb3MXsLrGWbsooi8bufdAMisxMqBqye9pI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=HksUQaGBikEsJaBbCaEKGnf9SYeIDEjD7DQ5jswCTVLum2QufiFZnCbOamBiJk2zH sSimhWPMKn3wRjHT7qGRV3cHRb1HteVJ73W4nf2ARS/9W+9+mnRQlx6iEEteGjd7KE 7ffkQFoa9aBPAUS5c5FhrBmOe359a2zNpWqLiMSRDlaKp5fi2QcGxKibdHTYY+CS4j LNmJIc3u7YY21v890P9+4neoIz3P/j5sdUH5FNS5m/9SAz4bWlvfO5NStu/MQsSv3W zBb63d+rnVASI8k5PNCGJnm47Zdc2pQJjCJGBjwE3hqVG7n/XWBCc6/T6VlOyiRbvb 9y1KBgEFPPWFQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WMHQ32GyDz6tn4; Sun, 14 Jul 2024 09:43:39 +0200 (CEST) From: Dariqq Date: Sun, 14 Jul 2024 07:42:54 +0000 Message-ID: <446b9098aa7f012c68629ca27b8d9435134ae953.1720942674.git.dariqq@posteo.net> 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 Most importantly the dependencies are now linked dynamically to avoid writing out a LD_LIBRARY_PATH wrapper. Also build the tests and skip installing the license file. Additionally provide custom paths to pci-ids and amdgpu-ids. * gnu/packages/admin.scm (fastfetch) (arguments): Move above inputs. [#:configure-flags]: Add -DBUILD_TESTS=ON, -DINSTALL_LICENSE=OFF, -DBINARY_LINK_TYPE=dynamic and set -DCUSTOM_PCI_IDS_PATH and -DCUSTOM_AMDGPU_IDS_PATH. [#:tests]: Remove as now there are tests available. [inputs]: Add hwdata and libdrm for the custom paths. Change-Id: I9f86b49f0a116bcee91ca15b6e77cfbb3867e290 --- gnu/packages/admin.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a9651b49d0..e97fe76a5a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4280,18 +4280,29 @@ (define-public fastfetch (snippet '(begin (delete-file-recursively "src/3rdparty"))))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=YES" + "-DBINARY_LINK_TYPE=dynamic" + "-DBUILD_TESTS=ON" + "-DINSTALL_LICENSE=OFF" + (string-append "-DCUSTOM_PCI_IDS_PATH=" + #$(this-package-input "hwdata") + "/share/hwdata/pci.ids") + (string-append "-DCUSTOM_AMDGPU_IDS_PATH=" + #$(this-package-input "libdrm") + "share/libdrm/amdgpu.ids")))) (inputs (list dbus glib + hwdata imagemagick + libdrm libxcb mesa wayland yyjson zlib)) ;for imagemagick and an #ifdef (native-inputs (list pkg-config)) - (arguments - (list #:tests? #f ; no test target - #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=YES"))) (home-page "https://github.com/fastfetch-cli/fastfetch") (synopsis "Display system information in a stylized manner") (description