From patchwork Wed Sep 18 15:27:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 68114 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 EDFA127BBEA; Wed, 18 Sep 2024 16:36:07 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 A729327BBE2 for ; Wed, 18 Sep 2024 16:36:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqwie-00078q-8M; Wed, 18 Sep 2024 11:35:52 -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 1sqwia-000785-Bg for guix-patches@gnu.org; Wed, 18 Sep 2024 11:35:48 -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 1sqwiY-0006K8-Rj for guix-patches@gnu.org; Wed, 18 Sep 2024 11:35:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jDYRkk1Ze/6FGF3pnjz4/LgFJe4Ow4hHGpINEcAgI7M=; b=oeh86eMfE/iTNvZhEgV6Wa9+C2KQM8JZ0aVFonUHnwNczJsNqtpqUhf94rY1LMR5YNykLCv6oPHPF41XO3T0nuAlJ0BJJnqCa8UhUUSCkf9AuGsua/Mf5Fi8cYJm95xDRlqF/E35U74ZsIHopqCGhjXn46GvYoCSNKSp1ZuWQIUmlT3MA7SGDrkPNgHLVKbn9nR197ygrD47+MwgCL6jYLNgeUeu3QOaJSvMvxvfGiDDYbj41+QJn5bZ2bEAyQg21s7IoCy1PjSLE9EVz+JkY1+SU1Ui+X9R4dNT3HxCBRMlbXopRVQZkHyd/VkCdM2pYOr7xul1hKNUZY2FU1OHVg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqwip-0003Vm-0H for guix-patches@gnu.org; Wed, 18 Sep 2024 11:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v5 3/5] gnu: fastfetch: Add more configure flags. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Sep 2024 15:36:02 +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.172667373513413 (code B ref 71968); Wed, 18 Sep 2024 15:36:02 +0000 Received: (at 71968) by debbugs.gnu.org; 18 Sep 2024 15:35:35 +0000 Received: from localhost ([127.0.0.1]:59151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqwiM-0003UH-PK for submit@debbugs.gnu.org; Wed, 18 Sep 2024 11:35:35 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqwiG-0003Oj-Cl for 71968@debbugs.gnu.org; Wed, 18 Sep 2024 11:35:32 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2F7DF24002E for <71968@debbugs.gnu.org>; Wed, 18 Sep 2024 17:35:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1726673706; bh=KLNsQu6Gju7QfNyEbJaZ3iWpRbH7Pq8VoKTADvcEQ30=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=FDc1C+4cLnC3Ik1oypBsehVBWmWEBm83O1tlNrR7tW9B/QbSbfXv3St4VXEmTZWQP umPUBK3LP60KtOg3l1JesonQBlQnHQ4E3ibDRYXpywPjkITFAeX9lXj5YHR1O1czsB Wai9tmC1ail2gpDq+yC8N13/05IxzmSkY1tA3dGbYaycddCMF6mNM/z6Y9VQ0BurzO xfPh04bfkoPR8UkAcgUZzk0iM1GFWihDKXHmAJRNRnaebsE4N/JASb2l7e7KmC7EeD JpK43h0HhjAMpBJ2fOPt3iRv/W8x/QdAUo23z6lfb2Fm3dRFXu+s9Vwq+PhfSU5Gn5 QyojWk3gEHUtA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4X82bM05ZWz9rxG; Wed, 18 Sep 2024 17:27:58 +0200 (CEST) From: Dariqq Date: Wed, 18 Sep 2024 15:27:09 +0000 Message-ID: In-Reply-To: <507a634c0db389695c2df167beaf31d63a5ad403.1726673231.git.dariqq@posteo.net> References: <507a634c0db389695c2df167beaf31d63a5ad403.1726673231.git.dariqq@posteo.net> 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 29e8c38ef3..2c47e43b4e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4298,18 +4298,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