diff options
| author | Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com> | 2023-11-28 12:35:02 +0100 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-11 13:37:59 +0200 |
| commit | 670c7560d1414980480769fb4876f5ee0e025651 (patch) | |
| tree | 65bd09b28f31170093c816ea3a8e1851a1369761 /gnu/packages/firmware.scm | |
| parent | 30d25ee201e0ae69e55494b14f9a08a0c917030b (diff) | |
| download | guix-670c7560d1414980480769fb4876f5ee0e025651.tar.gz | |
gnu: make-qmk-firmware: Use AVR target.
* gnu/packages/firmware.scm (qmk)[inputs]: Remove AVR toolchain. [arguments]: Adjust phase wrapping output. (make-qmk-firmware/implementation)[arguments]: Add avr as target. Change-Id: Ibe09f6ef3c555052faf2c5c243303d85675866be Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Diffstat (limited to 'gnu/packages/firmware.scm')
| -rw-r--r-- | gnu/packages/firmware.scm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 58253b93a7..06abfcec71 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1344,9 +1344,7 @@ corresponding layout." layout)) `("PATH" prefix ,(map (compose dirname (cut search-input-file inputs <>)) - '("bin/avr-ar" - "bin/avr-gcc" - "bin/avrdude" + '("bin/avrdude" "bin/awk" "bin/cmp" "bin/dfu-programmer" @@ -1359,16 +1357,13 @@ corresponding layout." layout)) ;; TODO: Remove after git is wrapped with these. "bin/basename" "bin/sed" - "bin/uname"))) - `("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH"))) - `("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH"))))))))) + "bin/uname"))))))))) ;; The inputs are not propagated since qmk is to be used strictly as a ;; command. (inputs ;; The 'qmk setup' command advises to use GCC at version 8, and there are ;; compilation errors in some firmware otherwise. - (list (make-avr-toolchain #:xgcc gcc-8) - avrdude + (list avrdude bash-minimal dfu-programmer dfu-util @@ -1441,6 +1436,7 @@ provided." (ice-9 ftw) (ice-9 match) (srfi srfi-26)) + #:target "avr" ;; XXX: Running a test target like "test:$keyboard" doesn't seem to run ;; anything and causes the .hex file to be regenerated; leave the tests ;; out for now. |