From patchwork Sun Jan 12 08:54:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 36987 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 DF2A627BBEA; Sun, 12 Jan 2025 09:02:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 8EEA027BBE2 for ; Sun, 12 Jan 2025 09:02:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWtrE-0005Ik-Jf; Sun, 12 Jan 2025 04:02:09 -0500 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 1tWtr9-0005I3-6C for guix-patches@gnu.org; Sun, 12 Jan 2025 04:02:03 -0500 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 1tWtr8-0004Pp-UA for guix-patches@gnu.org; Sun, 12 Jan 2025 04:02:02 -0500 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=ZT+N546usk6sZRp09+c73JpnT7aauHZ/D/aES5Qg+iE=; b=sXDSm0Cgk5XRMoTGA8KEuWlkWPRG1GwkReNrAHeyvodasYFWqS1xTAxP2tmv2+cRJxSRWHv6EnieKcLAiyfiPHOgA4QoCUO7ztHQv0hvkOmGLMx9cnmmRgsJO/manWGDtibluAiq4SQkuqcKS3Z4kvuX+8FKGWzPZPywnVtgef+8WOZwiONsob+dd/A+q4pl9lnMOc8zawIY99i6pbImXjcdeCpJvWIXNx4ZXw3E/6e6vC+/mDPQb9jLNEckZP1yBhnSXtY4YouKiCbhsp5+WoEedMkjB9+Kvm+4QVDBfNXr0Yq46K2OVub1tKxjhZCKeD5R454xcAurMQp5tEkyDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWtr8-000754-Pf for guix-patches@gnu.org; Sun, 12 Jan 2025 04:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75503] [PATCH v2 2/3] gnu: kpmcore: Fix missing commands. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75503@debbugs.gnu.org Cc: Zheng Junjie , Sughosha Received: via spool by 75503-submit@debbugs.gnu.org id=B75503.173667250927174 (code B ref 75503); Sun, 12 Jan 2025 09:02:02 +0000 Received: (at 75503) by debbugs.gnu.org; 12 Jan 2025 09:01:49 +0000 Received: from localhost ([127.0.0.1]:46066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWtqv-00074E-Du for submit@debbugs.gnu.org; Sun, 12 Jan 2025 04:01:49 -0500 Received: from layka.disroot.org ([178.21.23.139]:59890) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tWtqs-00073x-R5 for 75503@debbugs.gnu.org; Sun, 12 Jan 2025 04:01:47 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0244A259CB; Sun, 12 Jan 2025 10:01:46 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id eA7CCeZ1aQpE; Sun, 12 Jan 2025 10:01:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1736672501; bh=ZT5W+02N46seqS27YinjsgltJP4YT7XesXsSsGS8uJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gN3gULpGiv/uZLgFDWHsGkm39A+9IRm3QuAVgXohhT599Pth5P6ymXKOIl4sc106k 60WgnjQENVxJuSfY4C/qJ833CCreHY1FQ3UBf3xreVxjwJJpZ1Saqjp8+07mtirMUj ZDqzl9xvCavSRfZT/CBzh2H0sMuGexKv9IF0Klz8ceJ4xKlig/wmuSMP0u2L+rIRxS H4NSOZB9z7dCIephOc+PE3rbH8TT9JY1rb7Tj1OS9EMbrl9SoDR7XMSEW2oCgB2VYo kk239gmFTdM/apfC/okKAiBmcA5biAKRq6G30DckqSjIzO2UkYHBVuR1MDlSt2vU9I qDrMKRHkwSZhw== Date: Sun, 12 Jan 2025 14:24:36 +0530 Message-ID: <30aeb7bd1db7f54d30386b0d17add90b94dadb57.1736672077.git.sughosha@disroot.org> 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/kde.scm (kpmcore)[inputs]: Switch to the old input style; Add coreutils, cryptsetup, eudev, lvm2, mdadm, smartmontools and util-linux. [arguments]<#:phases>: Add patch-trustedprefixes-file phase. Change-Id: I6b205596e2ae5d03010db27b0b41ddb42d4534b5 --- gnu/packages/kde.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ce64619feb..7c02de246a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -45,6 +45,7 @@ (define-module (gnu packages kde) #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) @@ -58,6 +59,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages code) #:use-module (gnu packages cpp) #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -1269,14 +1271,21 @@ (define-public kpmcore (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kauth - kcoreaddons - ki18n - kwidgetsaddons - polkit-qt6 - qtbase - qca-qt6 - `(,util-linux "lib"))) + `(("coreutils" ,coreutils) + ("cryptsetup" ,cryptsetup) + ("eudev" ,eudev) + ("kauth" ,kauth) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kwidgetsaddons" ,kwidgetsaddons) + ("lvm2" ,lvm2) + ("mdadm" ,mdadm) + ("polkit-qt6" ,polkit-qt6) + ("qtbase" ,qtbase) + ("qca-qt6" ,qca-qt6) + ("smartmontools" ,smartmontools) + ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib"))) (arguments (list #:phases @@ -1287,7 +1296,17 @@ (define-public kpmcore (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION share/polkit-1/actions")) (substitute* "src/backend/corebackend.cpp" - (("\\/usr") #$output))))))) + (("\\/usr") #$output)))) + (add-before 'configure 'patch-trustedprefixes-file + (lambda _ + (call-with-output-file "src/util/trustedprefixes" + (lambda (port) + (map (lambda (prefix) + (display prefix port) + (newline port)) + '("/run/current-system/profile" + "/usr" + "/"))))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") (description "Library for managing partitions.")