GNU bug report logs - #40168
[PATCH]

Previous Next

Package: guix-patches;

Reported by: Damien Cassou <damien <at> cassou.me>

Date: Sat, 21 Mar 2020 17:04:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


Message #10 received at 40168-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Damien Cassou <damien <at> cassou.me>
Cc: 40168-done <at> debbugs.gnu.org
Subject: Re: [bug#40168] [PATCH]
Date: Sat, 21 Mar 2020 23:39:12 +0100
[Message part 1 (text/plain, inline)]
Hi Damien,

Damien Cassou <damien <at> cassou.me> skribis:

> Damien Cassou (3):
>   * gnu/packages/xdisorg.scm (clipmenu): Re-indent
>   * gnu/packages/xdisorg.scm (clipnotify): Add a comment
>   gnu: clipmenu: Improve the package definition

Applied!

I added a subject line to the commit logs.  For the last patch I
adjusted the shebang substitute:

[Message part 2 (text/x-patch, inline)]
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f7c4668bf8..facd63ab53 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2204,8 +2204,8 @@ tools to complement clipnotify.")
                  #t)))
            (add-after 'install 'wrap-script
              (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (clipnotify (assoc-ref inputs "clipnotify"))
+               (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"))
@@ -2227,7 +2227,7 @@ tools to complement clipnotify.")
                ;; file writes this string to a temporary file):
                (substitute* "tests/test-clipmenu"
                  (("#!/usr/bin/env bash")
-                  (which "bash")))
+                  (string-append "#!" (which "bash"))))
                (invoke "tests/test-clipmenu")
                #t)))))
       (inputs
[Message part 3 (text/plain, inline)]
Thanks!

Ludo’.

This bug report was last modified 5 years and 89 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.