diff options
Diffstat (limited to 'pkgs/applications/audio/axoloti/default.nix')
| -rw-r--r-- | pkgs/applications/audio/axoloti/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 274233167bd8..e3f1b6acf874 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip -, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }: +, gnumake, gcc-arm-embedded, binutils-arm-embedded +, dfu-util-axoloti, jdk, ant, libfaketime }: stdenv.mkDerivation rec { version = "1.0.12-2"; @@ -20,7 +21,15 @@ stdenv.mkDerivation rec { sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; }; - buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ]; + nativeBuildInputs = [ + makeWrapper + unzip + gcc-arm-embedded + binutils-arm-embedded + dfu-util-axoloti + ant + ]; + buildInputs = [jdk libfaketime ]; patchPhase = '' unzip ${chibios} @@ -31,15 +40,6 @@ stdenv.mkDerivation rec { substituteInPlace "chibios/os/various/shell.c" \ --replace "#ifdef __DATE__" "#if 0" - # Hardcode full path to compiler tools - for f in "firmware/Makefile.patch" \ - "firmware/Makefile" \ - "firmware/flasher/Makefile" \ - "firmware/mounter/Makefile"; do - substituteInPlace "$f" \ - --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-" - done - # Hardcode path to "make" for f in "firmware/compile_firmware_linux.sh" \ "firmware/compile_patch_linux.sh"; do |