From patchwork Mon Mar 6 19:19:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 47749 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 C72B716D7C; Mon, 6 Mar 2023 19:21:27 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A320616D5D for ; Mon, 6 Mar 2023 19:21:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZGON-0000SX-Th; Mon, 06 Mar 2023 14:21:03 -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 1pZGOL-0000RJ-Vd for guix-patches@gnu.org; Mon, 06 Mar 2023 14:21:01 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZGOL-0003TG-Ma for guix-patches@gnu.org; Mon, 06 Mar 2023 14:21:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZGOL-0001Cg-J7 for guix-patches@gnu.org; Mon, 06 Mar 2023 14:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62008] [PATCH 1/2] gnu: disarchive: Wrap program instead of using propagated inputs.. References: <20230306191814.3638619-1-zimon.toutoune@gmail.com> In-Reply-To: <20230306191814.3638619-1-zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 19:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62008 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62008@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 62008-submit@debbugs.gnu.org id=B62008.16781304064546 (code B ref 62008); Mon, 06 Mar 2023 19:21:01 +0000 Received: (at 62008) by debbugs.gnu.org; 6 Mar 2023 19:20:06 +0000 Received: from localhost ([127.0.0.1]:43663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZGNR-0001BD-TA for submit@debbugs.gnu.org; Mon, 06 Mar 2023 14:20:06 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:46065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZGNP-0001AW-EX for 62008@debbugs.gnu.org; Mon, 06 Mar 2023 14:20:04 -0500 Received: by mail-wm1-f43.google.com with SMTP id d41-20020a05600c4c2900b003e9e066550fso5821217wmp.4 for <62008@debbugs.gnu.org>; Mon, 06 Mar 2023 11:20:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678130397; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lo9QnYiOtYKSOsOc9cJ4dhBLId3FpXPYZcrOm12WZ+A=; b=Chhg0OPBnpny6zZngB1WBOloe19HMpvZzrmYpVRDE2zb/5WF/HL/KsQ3+wfv37cz63 USzPqcWBwSkfevS3W63zwpq9MpPH3YXLWS3srLehVyHsxZe2zqWEnXoWR3oPTjfL3eMD sOD42781VPk6n/R8Kg3yycyUxEj/akZ05pvm3+wLumtrO9+hnQGToYlyVznOfcNc2rYr wOQYGa/9AiFE3k23g+lv0WO15H/f+memVjoICnD5Zf0EJNAvpfeLGMn5LPJVXrWMmSLH NtiVPff2AGMTdeLmDZ3pQ2vqCUHClA6Mhuy7ZcxdaxdqvGBW6tpGPuVNmYvJpxZC/r/u oE3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678130397; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lo9QnYiOtYKSOsOc9cJ4dhBLId3FpXPYZcrOm12WZ+A=; b=PFUqQ0jQBbHRTYzBJUqYPJnCuVbzwrBigBVd4EKe2RLCsNHRkId9YaRqsSms189q8K Xg3K0GEmnf5KRDmE8YKwGSIEdz9Vfrt6VKQIpUgc/5OipXWBupIFz3sx1ggQSIZS0AaJ aJkjYccf6lVhx35tK5lxXzUgpsWCDeO6/0koX3DMa6p0yVv0x/lECtNQBKbymWyv5gGg O4Ms5w27hws2XOusz5tspXMf1LV3wwono9ZBZhc2jegRqbAuirGpJC5ju9de8ooCCswn qg+o89ZJul2xBQD+AOtVCPUeeJvyfh3nGSDaaUz4NP+hpTynJsNMUV0yQMUWZcV8M1wd MkDg== X-Gm-Message-State: AO0yUKUXA778pWfrHe1Z3r2fGI41Fs8FaC/KBxWMtYQG/7lJWiAoir4O JqYi0+vRAv6ngeqdSsU1nNXA//kb7fM= X-Google-Smtp-Source: AK7set+OwTB1qi2t9dOYl6/SxhlH0eEd6fjkroaHhv6pHwbmmW0tvqLKecs6d8BXGQuVv15E/8kIxA== X-Received: by 2002:a05:600c:1c1f:b0:3e7:f108:6456 with SMTP id j31-20020a05600c1c1f00b003e7f1086456mr9583887wms.0.1678130397559; Mon, 06 Mar 2023 11:19:57 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id q11-20020a05600c46cb00b003dc1d668866sm15829971wmo.10.2023.03.06.11.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 11:19:57 -0800 (PST) From: Simon Tournier Date: Mon, 6 Mar 2023 20:19:49 +0100 Message-Id: <20230306191950.3639176-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 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 * gnu/packages/backup.scm (disarchive)[arguments]: Add phase after install to wrap program. [inputs]: Add guile-gcrypt and guile-lzma. [propagated-inputs]: Remove it. --- gnu/packages/backup.scm | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7be0c813bb..7fe2e80d39 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Feng Shu +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1230,6 +1231,35 @@ (define-public disarchive (base32 "1pql8cspsxyx8cpw3xyhirnisv6rb4vj5mxr1d7w9la72q740n8s")))) (build-system gnu-build-system) + (arguments + (list + #:modules `((ice-9 popen) + ,@%gnu-build-system-modules) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((effective + (read (open-pipe* OPEN_READ + (string-append #$guile-3.0 "/bin/guile") + "-c" "(write (effective-version))"))) + (scm-dir (string-append "/share/guile/site/" effective)) + (go-dir (string-append "/lib/guile/" effective + "/site-ccache/")) + (modules (list #$output + #$guile-bytestructures + #$guile-gcrypt + #$guile-lzma)) + (scm-path + (map (lambda (module) (string-append module scm-dir)) + modules)) + (go-path + (map (lambda (module) (string-append module scm-dir)) + modules))) + (wrap-program (string-append #$output "/bin/disarchive") + `("PATH" ":" prefix (,(string-append #$output "/bin"))) + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)))))))) (native-inputs (list autoconf automake @@ -1239,9 +1269,7 @@ (define-public disarchive guile-lzma guile-quickcheck)) (inputs - (list guile-3.0 zlib)) - (propagated-inputs - (list guile-gcrypt guile-lzma)) + (list guile-3.0 guile-gcrypt guile-lzma zlib)) (home-page "https://ngyro.com/software/disarchive.html") (synopsis "Software archive disassembler") (description "Disarchive can disassemble software archives into data