From patchwork Mon Jan 22 21:02:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 59557 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 E5B7C27BBEA; Mon, 29 Jan 2024 18:09:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 45D5427BBE9 for ; Mon, 29 Jan 2024 18:09:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUW3z-0004KR-Nv; Mon, 29 Jan 2024 13:08:55 -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 1rUW3y-0004J6-I8 for guix-patches@gnu.org; Mon, 29 Jan 2024 13:08:54 -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 1rUW3y-0005IJ-5Z for guix-patches@gnu.org; Mon, 29 Jan 2024 13:08:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUW46-0006QM-HZ for guix-patches@gnu.org; Mon, 29 Jan 2024 13:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68447] [PATCH gnome-team v3 1/2] gnu: duplicity: Wrap for GI_TYPELIB_PATH. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jan 2024 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68447 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68447@debbugs.gnu.org Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 68447-submit@debbugs.gnu.org id=B68447.170655170024621 (code B ref 68447); Mon, 29 Jan 2024 18:09:02 +0000 Received: (at 68447) by debbugs.gnu.org; 29 Jan 2024 18:08:20 +0000 Received: from localhost ([127.0.0.1]:33417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3Q-0006Ox-Bm for submit@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:20 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]:42638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUW3M-0006OU-4T for 68447@debbugs.gnu.org; Mon, 29 Jan 2024 13:08:18 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 898015ff; Mon, 29 Jan 2024 18:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=L755QaTUytck5aj2XVs3VLOXDHU=; b=S xcP3XaI1C2Y6SETVFr4pSopjO0WqWvK2fOnjlOo9tOh84Ms44H9GPJHbCK5EAd6p YRAtSsDL5PEnlse9T0QCMNZ4jj2aOAqi38SV0CsvDbaWRuuhzGM1zCOp/nlUwXmT HsXf+QA2mrv7RTH8tO8RY1nE5NvX8Oj1V+BUSD+/myrlkCeVfPZ9861uuZIPVj8c OtayJewyqL88Z9UHZl5A/CuDROmcmoc/JAIyQ2YgmC908IPhKLbNrNYlWtl2WDQe VNaU2ix41VKXm9BCCU84MS62i99iB9Vv9R9vazg4QoIdAnikhZ9lHxLW5tQXn4/s hHdk8++GEng5M0wezECOA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fed28678 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 Jan 2024 18:08:01 +0000 (UTC) Message-ID: <8e89d62b7cc2d3a0197633964c080c569eb5bc73.1706550998.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Mon, 22 Jan 2024 22:02:42 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [inputs]: Add bash-minimal. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 --- gnu/packages/backup.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..e627531102 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -118,6 +118,7 @@ (define-public duplicity (build-system python-build-system) (native-inputs (list gettext-minimal ; for msgfmt + gobject-introspection util-linux ; setsid command, for the tests par2cmdline python-fasteners @@ -132,7 +133,8 @@ (define-public duplicity (propagated-inputs (list python-lockfile python-pygobject python-urllib3)) (inputs - (list dbus ; dbus-launch (Gio backend) + (list bash-minimal ; to run the wrapped program + dbus ; dbus-launch (Gio backend) librsync lftp gnupg ; gpg executable needed @@ -172,7 +174,12 @@ (define-public duplicity "share/zoneinfo")) ;; Some things respect TMPDIR, others hard-code /tmp, and the ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp")))))) + (setenv "TMPDIR" "/tmp"))) + (add-after 'wrap 'gi-wrap + (lambda _ + (let ((prog (string-append #$output "/bin/duplicity"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description