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/tools/simavr | |
parent | 501d072b5ff48d55b97027a38626cb252c4d026c (diff) | |
download | nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.gz nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.bz2 nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.lz nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.xz nixlib-aa4707fc3449192b961bfd2dfc16b9042df0d7f3.tar.zst nixlib-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/tools/simavr')
-rw-r--r-- | pkgs/development/tools/simavr/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index b009d5ed601b..e28aad40ef47 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut +{ stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut +, avrbinutils, avrgcc, avrlibc , libGLU_combined }: stdenv.mkDerivation rec { @@ -15,14 +16,10 @@ stdenv.mkDerivation rec { # ld: cannot find -lsimavr enableParallelBuilding = false; - preConfigure = '' - substituteInPlace Makefile.common --replace "-I../simavr/sim/avr -I../../simavr/sim/avr" \ - "-I${avrlibc}/avr/include -L${avrlibc}/avr/lib/avr5 -B${avrlibc}/avr/lib -I../simavr/sim/avr -I../../simavr/sim/avr" - ''; buildFlags = "AVR_ROOT=${avrlibc}/avr SIMAVR_VERSION=${version}"; installFlags = buildFlags + " DESTDIR=$(out)"; - + # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; @@ -31,8 +28,8 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ]; + nativeBuildInputs = [ which git pkgconfig avrgcc avrbinutils ]; + buildInputs = [ libelf freeglut libGLU_combined ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; @@ -43,4 +40,3 @@ stdenv.mkDerivation rec { }; } - |