ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qmk: Add many missing inputs and add more commands to PATH.

Browse source 
* gnu/packages/firmware.scm (qmk) [inputs]: Add bash-minimal, dfu-util,
diffutils, gawk, gnu-make, grep and python.
[arguments]: Add them to PATH in the wrapper in the wrap-path phase.  Also
capture avr-ar in the PATH.  Add CROSS_C_INCLUDE_PATH and
CROSS_LIBRARY_PATH to the wrapper.
This commit is contained in:
Maxim Cournoyer 2023-09-13 16:44:14 -04:00
parent 261a1f902a
commit 45be44bf3d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/firmware.scm
View file

@ -57,6 +57,7 @@ (define-module (gnu packages firmware)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages flashing-tools) #:use-module (gnu packages flashing-tools)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -1241,19 +1242,31 @@ (define-public qmk
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'wrap 'wrap-path (add-after 'wrap 'wrap-path
;; Wrap all the tools needed for the 'setup' and 'compile' actions
;; (tested with the 'ergodox_ez' keyboard).
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/qmk") (wrap-program (search-input-file outputs "bin/qmk")
`("PATH" prefix `("PATH" prefix
,(map (compose dirname ,(map (compose dirname
(cut search-input-file inputs <>)) (cut search-input-file inputs <>))
'("bin/avr-gcc" '("bin/avr-ar"
"bin/avr-gcc"
"bin/avrdude" "bin/avrdude"
"bin/awk"
"bin/cmp"
"bin/dfu-programmer" "bin/dfu-programmer"
"bin/dfu-util"
"bin/git" "bin/git"
"bin/grep"
"bin/make"
"bin/python3"
"bin/sh"
;; TODO: Remove after git is wrapped with these. ;; TODO: Remove after git is wrapped with these.
"bin/basename" "bin/basename"
"bin/sed" "bin/sed"
"bin/uname"))))))))) "bin/uname")))
`("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH")))
`("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH")))))))))
;; The inputs are not propagated since qmk is to be used strictly as a ;; The inputs are not propagated since qmk is to be used strictly as a
;; command. ;; command.
(inputs (inputs
@ -1261,8 +1274,15 @@ (define-public qmk
;; compilation errors in some firmware otherwise. ;; compilation errors in some firmware otherwise.
(list (make-avr-toolchain #:xgcc gcc-8) (list (make-avr-toolchain #:xgcc gcc-8)
avrdude avrdude
bash-minimal
dfu-programmer dfu-programmer
dfu-util
diffutils
git-minimal ;for the clone action git-minimal ;for the clone action
gawk
gnu-make
grep
python
python-dotty-dict python-dotty-dict
python-hid python-hid
python-hjson python-hjson