From patchwork Fri Jan 3 14:24:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 36402 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 77AC327BBEA; Fri, 3 Jan 2025 14:25:48 +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.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,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 051A927BBE2 for ; Fri, 3 Jan 2025 14:25:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTibw-0002PV-83; Fri, 03 Jan 2025 09:25:12 -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 1tTibu-0002Oe-M1 for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:10 -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 1tTibu-0000YR-CC for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:10 -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=ZK5GTx2FmQ/WYEM7ajNMZY8e8AYzdxoV7DVgsTXhDfA=; b=RX+9v8UvEGxRkxjPpH3LBfg4oNhbmrO51j27R7e3rCTjNBcCKseLsL/F2mFqkMK+d9JLBsU9jwpBiqQrLRGh5fbTBqSKN27Uas3wcjD+6kLJc8lSJ4l+uu6ezDH6pvOnepmb1lHWuNsBngJmqhjCeAUxq/Q1prb71q7jV8RyLDX9BBZPuGb591qjQQOzsUJ6HNpecsjwBNLa2RwJiRu/sxVYJZnjSwnEHnFZCFLKLhjB5QKyy1q/70BAq0J4YUX1NdPs/YJXMNLCAJOLIGyEElUOzE6WSgHR5dqn6zlIkMxx7r3sYfq/QiM9qhFPQ9NOTDLgXGGvF2dmv1Z98HbbZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTibt-0001t3-4i for guix-patches@gnu.org; Fri, 03 Jan 2025 09:25:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75317] [PATCH 4/6] gnu: gnucash: Do not wrap finance-quote-wrapper. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Jan 2025 14:25:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75317 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75317@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 75317-submit@debbugs.gnu.org id=B75317.17359142927055 (code B ref 75317); Fri, 03 Jan 2025 14:25:08 +0000 Received: (at 75317) by debbugs.gnu.org; 3 Jan 2025 14:24:52 +0000 Received: from localhost ([127.0.0.1]:50146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTibb-0001pd-Ku for submit@debbugs.gnu.org; Fri, 03 Jan 2025 09:24:52 -0500 Received: from wolfsden.cz ([37.205.8.62]:40798) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tTibS-0001ol-Gl for 75317@debbugs.gnu.org; Fri, 03 Jan 2025 09:24:43 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id BBA893442A0; Fri, 3 Jan 2025 14:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1735914280; bh=FgLuTTn3sxIWCtognzfqe42asJEDHTpDPl8gBfuCazM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BoId8fKF2lmUh4DqVTqrd2n7eRc23KeoeibysAVc0aYjnYsGuOSVm5bsb6fINiMO3 7x6AFA286EMrS+b/ul95agj7D94Yj8fubGmOH1Tw3dteJbWj3zhlsP2TqJ4VPx/hoE 0ktya5V3Qa2fjuQG7RHwk3yvf9KNKdqvhr+USCRQ3qUcyQivtOyh1UNA4uIb1caqL4 iQ3gXBLQyOUwQXmwqC2K3blAtwNauW612T6KLRny+LjCUsSvDES8GkAFfL+93Ejo5b Ubn0mMJfPeRbHRIW1sGgo3dcjuA1+OaIal3hD9Pg7bZx/1YX9X3ZvUsisJYt9oQini 72R0bL9ZPOC2PNOzDDcolAQpP3WQw98RTudH+cQFTuRJYrwB8LDl62VFxzIWn8mM3q GsRk0R7za6ng0RNNUmtVTqBdYofaH1sYABy8C3xUsHxN0wvyvAtbQkSejZxjLdi9cR u7PFgFIPQy0afWcmTcW5lmY6y21EClK/1f1YuzdAiBn3QwEEYSTc2ePv2I47da+E97 rFZ/mUsqd3/rKbL+mx9WH/7nRzKqqliLBLMtsIecSs1DUDTC4JBHK//vtBgcNrPOGp JyTSIgxCvCRJKk2Dl50ONZ6UT1EKbz9LjjS4Q14TtKXXGlwqE+1VRitZyYsXJmawHh hV1TgaTGPrwb+WG25HEJTUMk= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 29923343C70; Fri, 3 Jan 2025 14:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1735914279; bh=FgLuTTn3sxIWCtognzfqe42asJEDHTpDPl8gBfuCazM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zAj8MeFVWz4qfl50CLwaSBVBU0qIMwiBAocv7j9aq+VbzodWo0BQ+inyykSeDxq6o 3eDU9m/pV5FijaWHwdIoseSCtU3xJNZafUBWD8p6picSR8+s7QTVH9PeLCoggybhd9 6QTbmbjf/yq6As3bWTmccJwVDpt7g8mYJLCJ36ALeHU0AmQPSnvAV0ePIRZu23Qe7g VTIWBil2U3yHWkYcqh1eM/lE7wUgbo0le8HKGyYnkV6EdSS+co5RjQdRuN2YU9in1r cibOHQzjx9Z/tx1A1Y76j+ade+d9h8jlUjvKCiPrSBi1bzNq4XQRRVVRfnAqJBucpS B/jSrSAaW7GqayZGs4MZ/u31ZtBD7Y3xubzpKgLMx+ap0NlJTROCRhBfojtRy4oi6E 6Ml17CwuDt+oDpUjIHEMyChQh/tuW8pmZ6erJu3lVJdmb9QIUEzdZmA+3H/ynp2JEG B3UdHjrDGUnNF4fP6Sh8cTaHYe443nhszEFMVDQuERfyCdcwM9I9V1Dd5EBU3kxGzc go+UQLqcjuqUgSnZeE+ksrtnLYTkP4wwTVap03s3vAWYsqdY7Uuo3AyZmnlfqxEZIz GWBaO3k46UrAx0W1PU4IKrfRcErW/CLG/ppEeZ3QA5G57+r5GF7KWSTuijiC6QEUDv PsU92wkFnmiY7l/M/j0fktLM= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 3 Jan 2025 15:24:29 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 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 The file needs no special wrapping. Even before, it was wrapped just by accident (via the glib-or-gtk-wrap phase). Wrapping changes it from perl script to shell script and gnucash cannot deal with that. So stop wrapping it. * gnu/packages/gnucash.scm (gnucash)[arguments]<#:phases>: Add 'unwrap-some. Wrap gnucash-cli in 'wrap-programs. Change-Id: I60e7ac5cf40fb00f9620b9ee9d725770009721d2 --- gnu/packages/gnucash.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 12a168d6fd..3f4967b2ef 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -151,8 +151,10 @@ (define-public gnucash 'inputs (map (lambda (l) (assoc l (package-inputs this-package))) - '("perl-finance-quote")))))))) - '("gnucash")))) + '("perl-json-parse" + "perl-finance-quote")))))))) + '("gnucash" + "gnucash-cli")))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap @@ -161,7 +163,18 @@ (define-public gnucash (lambda _ ;; We are not updating Finance::Quote from CPAN. There is no ;; reason to install this binary. - (delete-file (string-append #$output "/bin/gnc-fq-update"))))))) + (delete-file (string-append #$output "/bin/gnc-fq-update")))) + (add-after 'glib-or-gtk-wrap 'unwrap-some + (lambda _ + (for-each + (lambda (prog) + (delete-file (string-append #$output "/bin/" prog)) + (rename-file (string-append #$output "/bin/." prog "-real") + (string-append #$output "/bin/" prog))) + ;; Sadly glib-or-gtk-wrap does not allow excluding individual + ;; files. Being wrapped breaks the finance-quote-wrapper (it + ;; is expected to be a perl script, not a shell one). + '("finance-quote-wrapper"))))))) (native-inputs (list gmp `(,glib "bin") ;glib-compile-schemas, etc.