diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/axoloti.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index ba49a9d0f0..2a5cf8e0fc 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -527,7 +527,7 @@ patcher application."))) (install-file "dist/Axoloti.jar" share) ;; Install old firmware - (let ((target (string-append share "/old_firmware/")) + (let ((target (string-append share "/old_firmware/firmware-1.0.12")) (old-firmware (string-append (assoc-ref inputs "axoloti-runtime") "/share/axoloti/firmware/"))) @@ -557,7 +557,7 @@ patcher application."))) toolchain "/arm-none-eabi/include:" toolchain - "/arm-none-eabi/include/arm-none-eabi/armv7e-m"))) + "/arm-none-eabi/include/arm-none-eabi/thumb/v7e-m"))) (display (string-append "#!" (which "sh") "\n" "export CROSS_CPATH=" includes "\n" |