From patchwork Sat Oct 19 07:56:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 69102 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 7BA0527BBEA; Sat, 19 Oct 2024 08:58:00 +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_DNSWL_BLOCKED, 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 3052D27BBE2 for ; Sat, 19 Oct 2024 08:58:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t24LI-0000tD-Cb; Sat, 19 Oct 2024 03:57:44 -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 1t24LE-0000eB-23 for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:40 -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 1t24LD-00087I-Mz for guix-patches@gnu.org; Sat, 19 Oct 2024 03:57:39 -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=ziFzadx8EkSILr8BTwOp4TndemJAPOoklahgZNf8gaw=; b=rimkVtvxv1jPNmQFTLmGTsB3zaIYeuXFqgUEskml+K06flc3Ofib/1gKHq78NNJrF8d/0aff/6keRyLzg6ABqIXIuRYaCvchOkP7nH99m63OpzTYrJL0+qrOLEIFmCBOJ4N6sYz1OZk62JP3TgOpP3VJ24Gc9CQAloD8azj+v2/2CxqMQe1dUqqzO1xnKzuADUc4l5aIf/KneCdVDlLJ5ENOAIRtqvll4VisWcR1OGQCA8Ahb1oo+gHX+GMlSZTvIs+YGVlAevZO0GXJzOsMCWVgM1XQDjkbICBYs9G4ID8R/gIxa1X2iho0QLKlsMB8golnikWYssk/peqLZLAt4A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t24Lb-00018j-42 for guix-patches@gnu.org; Sat, 19 Oct 2024 03:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71968] [PATCH v6 3/5] gnu: fastfetch: Add more configure flags. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Oct 2024 07:58: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.17293246574307 (code B ref 71968); Sat, 19 Oct 2024 07:58:03 +0000 Received: (at 71968) by debbugs.gnu.org; 19 Oct 2024 07:57:37 +0000 Received: from localhost ([127.0.0.1]:41222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24LB-00017M-8A for submit@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t24L8-00016o-M9 for 71968@debbugs.gnu.org; Sat, 19 Oct 2024 03:57:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BF2BE240101 for <71968@debbugs.gnu.org>; Sat, 19 Oct 2024 09:57:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1729324624; bh=+a0runpuny73p0yY1mNLZ5gkfK6taJmZ+zANuRIC0Jg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=A4uRjq2nAOQPyBNAmHXi/q3DlJ+i/I8jGADIMNN1HkxI0sPYuLfKuSTq5UxZg74G6 XlTk/MtIJI0CzgxqhIeoN2sYS5zDiMKDza7rMgu4m1DWASy4qHwJIAoGx4ZqDCUGoP iWaHbSWWb7eAoip/KocalcpwfzR+9jpsoe4Wv+X0UiB53i+D8VooV/j9bUZrcF/yVl WM1vkORkXpodshOTFCh7jj/km+56OKNvb1K/qqx7zOR+CTXWqTK98mXpluZtG6m2U3 1RUw6l5pefYKgSevLcemDaEblNiIMxImHLETk7Oex2w5CEYzrjZ9n6e8cablxrnDlE Jau/l5tKqV2ew== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4XVv6m0b6nz9rxQ; Sat, 19 Oct 2024 09:57:04 +0200 (CEST) From: Dariqq Date: Sat, 19 Oct 2024 07:56:38 +0000 Message-ID: <951b3e902e8584d12af678c624e7bc3e808facdc.1729324600.git.dariqq@posteo.net> In-Reply-To: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.git.dariqq@posteo.net> References: <0f29d3c61209681e684687686cf650e309aa63b8.1729324600.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 bbea957a87..ed6cd7de95 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4294,18 +4294,29 @@ (define-public fastfetch (snippet '(begin (delete-file-recursively "src/3rdparty"))))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DENABLE_SYSTEM_YYJSON=ON" + "-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=ON"))) (home-page "https://github.com/fastfetch-cli/fastfetch") (synopsis "Display system information in a stylized manner") (description