From patchwork Sat Mar 21 17:02:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Cassou X-Patchwork-Id: 20824 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 3D06527BBEA; Sat, 21 Mar 2020 17:04:13 +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, 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 ESMTP id 92B1327BBE4 for ; Sat, 21 Mar 2020 17:04:12 +0000 (GMT) Received: from localhost ([::1]:39150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFhXg-0007QG-0J for patchwork@mira.cbaines.net; Sat, 21 Mar 2020 13:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53192) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFhXY-0007Q0-IA for guix-patches@gnu.org; Sat, 21 Mar 2020 13:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFhXW-0008Iz-Go for guix-patches@gnu.org; Sat, 21 Mar 2020 13:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41945) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFhXW-0008It-CV for guix-patches@gnu.org; Sat, 21 Mar 2020 13:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jFhXW-0007eI-7u for guix-patches@gnu.org; Sat, 21 Mar 2020 13:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40168] [PATCH] Resent-From: Damien Cassou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Mar 2020 17:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40168 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40168@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158481019629340 (code B ref -1); Sat, 21 Mar 2020 17:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2020 17:03:16 +0000 Received: from localhost ([127.0.0.1]:47918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFhWl-0007d9-TN for submit@debbugs.gnu.org; Sat, 21 Mar 2020 13:03:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:44650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jFhWk-0007d2-7I for submit@debbugs.gnu.org; Sat, 21 Mar 2020 13:03:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53111) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFhWi-0007GL-7L for guix-patches@gnu.org; Sat, 21 Mar 2020 13:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFhWg-00087J-5m for guix-patches@gnu.org; Sat, 21 Mar 2020 13:03:12 -0400 Received: from mail.choca.pics ([80.67.172.235]:33502) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jFhWf-00084U-OI; Sat, 21 Mar 2020 13:03:10 -0400 Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 3F54618195760; Sat, 21 Mar 2020 18:03:00 +0100 (CET) Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id t_luO2ZVzv6w; Sat, 21 Mar 2020 18:02:59 +0100 (CET) Received: from localhost (localhost.localdomain [IPv6:::1]) by mail.choca.pics (Postfix) with ESMTP id 1557618191BB0; Sat, 21 Mar 2020 18:02:59 +0100 (CET) X-Virus-Scanned: amavisd-new at choca.pics Received: from mail.choca.pics ([IPv6:::1]) by localhost (mail.choca.pics [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id gC0m3GFbBchd; Sat, 21 Mar 2020 18:02:58 +0100 (CET) Received: from luz4 (57.139.120.78.rev.sfr.net [78.120.139.57]) by mail.choca.pics (Postfix) with ESMTPSA id A9F5818192B26; Sat, 21 Mar 2020 18:02:58 +0100 (CET) From: Damien Cassou Date: Sat, 21 Mar 2020 18:02:57 +0100 Message-ID: <87imixr67y.fsf@cassou.me> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Hi, I've improved the packaging for clipmenu in gnu/packages/xdisorg.scm. Please give feedback. I found that my usage of wrap-script is very verbose. Is there a simpler way? Thank you Damien Cassou (3): * gnu/packages/xdisorg.scm (clipmenu): Re-indent * gnu/packages/xdisorg.scm (clipnotify): Add a comment gnu: clipmenu: Improve the package definition gnu/packages/xdisorg.scm | 125 ++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 53 deletions(-) From 391ad6deec073b7e01984fd81a44a5cac52afc5b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 21 Mar 2020 17:33:39 +0100 Subject: [PATCH 3/3] gnu: clipmenu: Improve the package definition * gnu/packages/xdisorg.scm (clipmenu): Add the package's unit-tests to the check phase. Wrap the program so the PATH contains all dependencies. The previous approach to patch the script was incomplete and more complex. --- gnu/packages/xdisorg.scm | 52 +++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 21165f384f..f7c4668bf8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -74,6 +74,7 @@ (define-module (gnu packages xdisorg) #:use-module (gnu packages pkg-config) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -2188,21 +2189,6 @@ (define-public clipmenu (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "clipmenud" - (("has_clipnotify=0") - "has_clipnotify=1") - (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") - "") - (("clipnotify \\|\\| .*") - (string-append (which "clipnotify") "\n")) - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - (substitute* "clipmenu" - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - #t)) (delete 'configure) (delete 'build) (replace 'install @@ -2215,10 +2201,42 @@ (define-public clipmenu (install-file "clipmenu" bin) (install-file "clipmenud" bin) (install-file "README.md" doc) - #t)))) - #:tests? #f)) + #t))) + (add-after 'install 'wrap-script + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (clipnotify (assoc-ref inputs "clipnotify")) + (coreutils-minimal (assoc-ref inputs "coreutils-minimal")) + (gawk (assoc-ref inputs "gawk")) + (util-linux (assoc-ref inputs "util-linux")) + (xdotool (assoc-ref inputs "xdotool")) + (xsel (assoc-ref inputs "xsel"))) + (for-each + (lambda (prog) + (wrap-script (string-append out "/bin/" prog) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list clipnotify coreutils-minimal + gawk util-linux xdotool xsel))))) + '("clipmenu" "clipmenud" "clipdel"))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; substitute a shebang appearing inside a string (the test + ;; file writes this string to a temporary file): + (substitute* "tests/test-clipmenu" + (("#!/usr/bin/env bash") + (which "bash"))) + (invoke "tests/test-clipmenu") + #t))))) (inputs `(("clipnotify" ,clipnotify) + ("coreutils-minimal" ,coreutils-minimal) + ("gawk" ,gawk) + ("guile" ,guile-3.0) ; for wrap-script + ("util-linux" ,util-linux) + ("xdotool" ,xdotool) ("xsel" ,xsel))) (home-page "https://github.com/cdown/clipmenu") (synopsis "Simple clipboard manager using dmenu or rofi and xsel") -- 2.25.1