From patchwork Mon Mar 15 22:02:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Reich=C3=B6r?= X-Patchwork-Id: 27856 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 243E127BC54; Mon, 15 Mar 2021 22:03:18 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 735C627BC52 for ; Mon, 15 Mar 2021 22:03:17 +0000 (GMT) Received: from localhost ([::1]:59894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLvIy-0005T6-J5 for patchwork@mira.cbaines.net; Mon, 15 Mar 2021 18:03:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLvIk-0005R3-QZ for guix-patches@gnu.org; Mon, 15 Mar 2021 18:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLvIk-00059N-Gf for guix-patches@gnu.org; Mon, 15 Mar 2021 18:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLvIk-0002Xw-DJ for guix-patches@gnu.org; Mon, 15 Mar 2021 18:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47177] [PATCH] gnu: tmsu: Improve installation Resent-From: Stefan =?utf-8?q?Reich=C3=B6r?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Mar 2021 22:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47177 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47177@debbugs.gnu.org Cc: Stefan =?utf-8?q?Reich=C3=B6r?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16158457529750 (code B ref -1); Mon, 15 Mar 2021 22:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Mar 2021 22:02:32 +0000 Received: from localhost ([127.0.0.1]:37456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLvIG-0002XC-45 for submit@debbugs.gnu.org; Mon, 15 Mar 2021 18:02:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:60218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLvID-0002X3-MN for submit@debbugs.gnu.org; Mon, 15 Mar 2021 18:02:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLvID-0004sz-AK for guix-patches@gnu.org; Mon, 15 Mar 2021 18:02:29 -0400 Received: from dd3624.kasserver.com ([85.13.130.11]:56210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLvIA-0004rI-NP for guix-patches@gnu.org; Mon, 15 Mar 2021 18:02:28 -0400 Received: from localhost (217-149-161-117.nat.highway.telekom.at [217.149.161.117]) by dd3624.kasserver.com (Postfix) with ESMTPA id 4EAC35D402EA; Mon, 15 Mar 2021 23:02:22 +0100 (CET) From: Stefan =?utf-8?q?Reich=C3=B6r?= Date: Mon, 15 Mar 2021 23:02:20 +0100 Message-Id: <20210315220220.90268-1-stefan@xsteve.at> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Received-SPF: none client-ip=85.13.130.11; envelope-from=stefan@xsteve.at; helo=dd3624.kasserver.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/file-systems.scm (tmsu)[arguments] - Don't install go source files - Install as /bin/tmsu instead as /bin/TMSU --- gnu/packages/file-systems.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index e7d78e41fb..198653c639 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 raid5atemyhomework +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -1174,7 +1175,16 @@ local file system using FUSE.") (build-system go-build-system) (arguments `(#:import-path "github.com/oniony/TMSU" - #:unpack-path "..")) + #:unpack-path ".." + #:install-source? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The go build system produces /bin/TMSU -> install as /bin/tmsu + (rename-file (string-append out "/bin/TMSU") + (string-append out "/bin/tmsu")))))))) (inputs `(("go-github-com-mattn-go-sqlite3" ,go-github-com-mattn-go-sqlite3) ("go-github-com-hanwen-fuse" ,go-github-com-hanwen-fuse)))