futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: console-setup: Use G-expressions.

Browse Source 
* gnu/packages/xorg.scm (console-setup)[arguments]:
Rewrite as G-expressions.
This commit is contained in:
Tobias Geerinckx-Rice 2022-07-24 02:00:01 +02:00
parent a2bd3758c1
commit 0bb061190e
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gnu/packages/xorg.scm
View File

@ -6585,29 +6585,30 @@ output.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:make-flags (list #:make-flags
(list (string-append "SHELL=" (assoc-ref %build-inputs "bash") #~(list (string-append "SHELL=" (assoc-ref %build-inputs "bash")
"/bin/bash") "/bin/bash")
(string-append "prefix=" (assoc-ref %outputs "out"))) (string-append "prefix=" #$output))
#:tests? #f ; no tests #:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'patch-file-names (add-after 'unpack 'patch-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; 'ckbcomp' calls out to 'cat' (!). Give it the right file ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file
;; name. ;; name.
(substitute* '("Keyboard/ckbcomp") (substitute* '("Keyboard/ckbcomp")
(("\"cat ") (("\"cat ")
(format #f "\"~a " (search-input-file inputs "bin/cat")))))) (format #f "\"~a "
(add-before 'build 'make-doubled-bdfs (search-input-file inputs "bin/cat"))))))
(lambda* (#:key make-flags #:allow-other-keys) (add-before 'build 'make-doubled-bdfs
(apply invoke "make" "-C" "Fonts" "doubled_bdfs" (lambda* (#:key make-flags #:allow-other-keys)
make-flags))) (apply invoke "make" "-C" "Fonts" "doubled_bdfs"
(replace 'install make-flags)))
(lambda* (#:key make-flags #:allow-other-keys) (replace 'install
(apply invoke "make" "install-linux" (lambda* (#:key make-flags #:allow-other-keys)
make-flags)))))) (apply invoke "make" "install-linux"
make-flags))))))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
bdftopcf bdftopcf