diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/axoloti.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index c6dd748773..622c4f94cb 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -205,7 +205,7 @@ ;; for uploading compiled patches and firmware ("dfu-util" ,dfu-util-for-axoloti))) (native-inputs - `(("unzip" ,unzip))) + (list unzip)) (home-page "http://www.axoloti.com/") (synopsis "Audio development environment for the Axoloti core board") (description @@ -318,8 +318,8 @@ runtime.") (lambda () (let* ((dir (string-append (assoc-ref outputs "out") "/share/axoloti")) - (runtime (string-append (assoc-ref inputs "axoloti-runtime") - "/share/axoloti")) + (runtime (search-input-directory inputs + "share/axoloti")) (toolchain (assoc-ref inputs "cross-toolchain")) (includes (string-append toolchain @@ -351,9 +351,8 @@ runtime.") ("java-jgit" ,java-jgit-4.2) ("axoloti-runtime" ,axoloti-runtime))) (native-inputs - `(("ant" ,ant) - ("zip" ,zip) ; for repacking the jar - ("unzip" ,unzip))) + (list ant zip ; for repacking the jar + unzip)) (description "The Axoloti patcher offers a “patcher” environment similar to Pure Data for sketching digital audio algorithms. The patches run on a standalone @@ -374,11 +373,9 @@ patcher application."))) (sha256 (base32 "022p993wf9l9mp6vg94x592vfqd1k1sjrq5f6x45h5r16qy6bdzh")) (modules '((guix build utils))) + ;; Remove pre-built Java binaries. (snippet - '(begin - ;; Remove pre-built Java binaries. - (delete-file-recursively "lib/") - #t)))) + '(delete-file-recursively "lib/")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there's a Java test which is run as part of the Java build. @@ -530,16 +527,16 @@ patcher application."))) ;; Install 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/"))) + (search-input-directory inputs + "share/axoloti/firmware"))) (mkdir-p target) (install-file (string-append old-firmware - "flasher/flasher_build/flasher.bin") + "/flasher/flasher_build/flasher.bin") target) ;; TODO: the old file differs from the file that is included ;; in this repository as the old firmware. (install-file (string-append old-firmware - "build/axoloti.bin") + "/build/axoloti.bin") target)) ;; We do this to ensure that this package retains references to @@ -574,8 +571,7 @@ patcher application."))) " -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine" " -Daxoloti_release=" share " -jar " dir "/Axoloti.jar"))))) - (chmod target #o555)) - #t))) + (chmod target #o555))))) (add-after 'install 'strip-jar-timestamps (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))) (inputs |