diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-12 15:21:26 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-30 13:31:45 -0500 |
commit | aa4707fc3449192b961bfd2dfc16b9042df0d7f3 (patch) | |
tree | 02678d0bdefb86a692e8ac435484b7ec03ebf6c2 /pkgs/development/misc | |
parent | 501d072b5ff48d55b97027a38626cb252c4d026c (diff) | |
download | nixpkgs-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/development/misc')
-rw-r--r-- | pkgs/development/misc/newlib/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/misc/stm32/betaflight/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/misc/stm32/inav/default.nix | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index e26f0f78f21..693cfa093b0 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -23,12 +23,13 @@ in stdenv.mkDerivation { "--disable-nls" "--enable-newlib-io-long-long" "--enable-newlib-register-fini" + "--enable-newlib-retargetable-locking" ]; dontDisableStatic = true; passthru = { - incdir = "/${stdenv.hostPlatform.config}/include"; - libdir = "/${stdenv.hostPlatform.config}/lib"; + incdir = "/${stdenv.targetPlatform.config}/include"; + libdir = "/${stdenv.targetPlatform.config}/lib"; }; } diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 0c601c7773c..21230464e74 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, gcc-arm-embedded, python2 +, gcc-arm-embedded, binutils-arm-embedded, python2 , skipTargets ? [ # These targets do not build, for the reasons listed, along with the last version checked. # Probably all of the issues with these targets need to be addressed upstream. @@ -24,8 +24,8 @@ in stdenv.mkDerivation rec { sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5"; }; - buildInputs = [ - gcc-arm-embedded + nativeBuildInputs = [ + gcc-arm-embedded binutils-arm-embedded python2 ]; @@ -58,7 +58,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/betaflight/betaflight; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index cb9cc80d325..9c35ac2ffce 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, gcc-arm-embedded, ruby +, gcc-arm-embedded, binutils-arm-embedded, ruby }: let @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y"; }; - buildInputs = [ - gcc-arm-embedded + nativeBuildInputs = [ + gcc-arm-embedded binutils-arm-embedded ruby ]; @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { homepage = https://inavflight.github.io; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = [ "i686-linux" "x86_64-linux" ]; }; } |