diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/axoloti.scm | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 0b12e4fe29..c6dd748773 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -125,6 +125,11 @@ (("arm-none-eabi-(gcc|g\\+\\+|objcopy|objdump)" tool) (which tool))) + ;; XXX: for some reason the whitespace substitution does not + ;; work, so we disable it. + (substitute* "firmware/Makefile.patch" + (("^BDIR=.*") "BDIR=${axoloti_home}/build\n")) + ;; Hardcode full path to compiler tools (substitute* '("firmware/Makefile" "firmware/flasher/Makefile" |