summary refs log tree commit diff
path: root/pkgs/applications/misc/opentx
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-10-12 15:21:26 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-10-30 13:31:45 -0500
commitaa4707fc3449192b961bfd2dfc16b9042df0d7f3 (patch)
tree02678d0bdefb86a692e8ac435484b7ec03ebf6c2 /pkgs/applications/misc/opentx
parent501d072b5ff48d55b97027a38626cb252c4d026c (diff)
downloadnixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.gz
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.bz2
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.lz
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.xz
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.zst
nixpkgs-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.zip
treewide: use gnu toolchain for avr/arm-embedded
These packages should in theory work with our GCC toolchains, but
there are some definite breakages that need to be tracked down.
Comparing output of these to old gcc-arm-embedded is important.

Affected packages include:

- axolooti
- avrdudess
- opentx
- microscheme
- betaflight
- inav
- blackmagic
- simavr
- gnuk
Diffstat (limited to 'pkgs/applications/misc/opentx')
-rw-r--r--pkgs/applications/misc/opentx/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 8a941a719f2..0aecc43d1e5 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, cmake, gcc-arm-embedded, python
+, cmake, gcc-arm-embedded, binutils-arm-embedded, python
 , qt5, SDL, gmock
 , dfu-util, avrdude
 }:
@@ -21,10 +21,12 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    gcc-arm-embedded binutils-arm-embedded
+  ];
 
   buildInputs = with qt5; [
-    gcc-arm-embedded
     python python.pkgs.pyqt4
     qtbase qtmultimedia qttranslations
     SDL gmock