guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: console-setup: Set absolute file name of 'cat' in 'ckbcomp'.


From: guix-commits
Subject: 02/03: gnu: console-setup: Set absolute file name of 'cat' in 'ckbcomp'.
Date: Sun, 17 Mar 2019 11:30:10 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 3822003082478fb3d24af1b411ffe17406a83e93
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 17 16:21:38 2019 +0100

    gnu: console-setup: Set absolute file name of 'cat' in 'ckbcomp'.
    
    * gnu/packages/xorg.scm (console-setup)[arguments]: Add
    'patch-file-names' phase.
---
 gnu/packages/xorg.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b553d45..3463ac8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6378,6 +6378,15 @@ output.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
+         (add-after 'unpack 'patch-file-names
+           (lambda _
+             ;; 'ckbcomp' calls out to 'cat' (!).  Give it the right file
+             ;; name.
+             (substitute* '("Keyboard/ckbcomp")
+               (("\"cat ")
+                (string-append "\"" (which "cat")
+                               " ")))
+             #t))
          (add-before 'build 'make-doubled-bdfs
            (lambda* (#:key inputs #:allow-other-keys)
              (invoke "make" "-C" "Fonts"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]