From patchwork Thu Jan 28 02:02:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 26693 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 831C727BC1C; Thu, 28 Jan 2021 02:03:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 50FA127BC1B for ; Thu, 28 Jan 2021 02:03:27 +0000 (GMT) Received: from localhost ([::1]:36216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4wec-0000wk-IF for patchwork@mira.cbaines.net; Wed, 27 Jan 2021 21:03:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4weE-0000wZ-MG for guix-patches@gnu.org; Wed, 27 Jan 2021 21:03:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4weE-0007KD-FE for guix-patches@gnu.org; Wed, 27 Jan 2021 21:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4weE-0008Oy-CN for guix-patches@gnu.org; Wed, 27 Jan 2021 21:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46148] [PATCH 1/1] gnu: pinentry-rofi: Update to 2.0.2. References: <20210128015659.148867-1-plattfot@posteo.net> In-Reply-To: <20210128015659.148867-1-plattfot@posteo.net> Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jan 2021 02:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46148@debbugs.gnu.org Received: via spool by 46148-submit@debbugs.gnu.org id=B46148.161179934532245 (code B ref 46148); Thu, 28 Jan 2021 02:03:02 +0000 Received: (at 46148) by debbugs.gnu.org; 28 Jan 2021 02:02:25 +0000 Received: from localhost ([127.0.0.1]:46600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4wdc-0008O0-Rh for submit@debbugs.gnu.org; Wed, 27 Jan 2021 21:02:25 -0500 Received: from mout01.posteo.de ([185.67.36.65]:60861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4wda-0008Nj-R0 for 46148@debbugs.gnu.org; Wed, 27 Jan 2021 21:02:23 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id B00FA16005C for <46148@debbugs.gnu.org>; Thu, 28 Jan 2021 03:02:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1611799336; bh=nh2EvrrKkySpJ/uSxBumNzR9EKvfu1VBInPB06uCYpA=; h=From:To:Cc:Subject:Date:From; b=CMOaE5bSb/Gjdd2UbbMDATemmqJNkwWokGUkJKE0qYwaYEfZZSrB8z2ZnHBTxvquE +uPo0HIxlvnBkoSf31WrF/CzkoLEl8q6YaLDpVAZIypg6hxF8dFU2FEeu6+X1saZnZ F1VPXH734RWRtHdJ6kNRHOM1M8BojeSu/gNQ8zZEldyI2bj2gEjPTX24cd4I+BfsYR +7ufabDwPN/Jrkr/RJw5ALuVuB1TnO2DnElTEO2UoL2N/8erR+dalZMbdpP4rKF6Cm cGhwRxLTqGJuaqtZwH9lDoTqV+lirUG9RK3J9WUI9YLTyQ+J256lA6/fNU13Fraojo YJnGhXC8HZL1g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DR3d35Zhbz6tmK; Thu, 28 Jan 2021 03:02:15 +0100 (CET) From: Fredrik Salomonsson Date: Wed, 27 Jan 2021 18:02:07 -0800 Message-Id: <20210128020207.149383-1-plattfot@posteo.net> X-Mailer: git-send-email 2.30.0 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: , Cc: Fredrik Salomonsson Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.2. * gnu/packages/gnupg.scm (pinentry-rofi): Simplify the package definition. --- gnu/packages/gnupg.scm | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6e80ca339f..9be8a32540 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -894,7 +894,7 @@ passphrase when @code{gpg} is run and needs it."))) (define-public pinentry-rofi (package (name "pinentry-rofi") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -902,7 +902,7 @@ passphrase when @code{gpg} is run and needs it."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "044bnldz7k74s873jwsjgff176l1jsvpbaka7d1wcj8b5pwqv2av")))) + (base32 "14rbz32ykc8pz7gglbvxm3pcgabr7xdnddar6k24icd5xk9mr4rp")))) (build-system gnu-build-system) (arguments `(#:modules @@ -914,38 +914,15 @@ passphrase when @code{gpg} is run and needs it."))) %standard-phases (add-after 'install 'hall-wrap-binaries (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((compiled-dir - (lambda (out version) - (string-append out "/lib/guile/" version "/site-ccache"))) - (uncompiled-dir - (lambda (out version) - (string-append - out - "/share/guile/site" - (if (string-null? version) "" "/") - version))) - (dep-path - (lambda (env path) - (list env ":" 'prefix (list path)))) - (out (assoc-ref outputs "out")) + (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) - (site (uncompiled-dir out ""))) + (site (string-append out "/share/guile/site")) + (rofi-bin (string-append (assoc-ref inputs "rofi") "/bin"))) (match (scandir site) (("." ".." version) - (for-each - (lambda (file) - (wrap-program - (string-append bin file) - (dep-path - "PATH" - (string-append (assoc-ref inputs "rofi") "/bin")) - (dep-path - "GUILE_LOAD_PATH" - (uncompiled-dir out version)) - (dep-path - "GUILE_LOAD_COMPILED_PATH" - (compiled-dir out version)))) - ,''("pinentry-rofi")) + (wrap-program + (string-append bin "pinentry-rofi") + (list "PATH" ":" 'prefix `(,rofi-bin))) #t)))))))) (native-inputs `(("autoconf" ,autoconf)