diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-30 13:49:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 13:49:08 -0500 |
| commit | a6fa5bd936a03b8453e75d4ac019b8faeabd0587 (patch) | |
| tree | 660052c8b4598c714d604e8d19be4938188165df /pkgs/applications/misc | |
| parent | 46f5debb9446d20bf0b478853f34482a36beff77 (diff) | |
| parent | 2634d376175d300c1c2572defe8c6d348ad61e20 (diff) | |
| download | nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar.gz nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar.bz2 nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar.lz nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar.xz nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.tar.zst nixlib-a6fa5bd936a03b8453e75d4ac019b8faeabd0587.zip | |
Merge pull request #48286 from matthewbauer/avrgcc
avr: use new cross compilation infrastructure
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/avrdudess/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/opentx/default.nix | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index c803eb37ad6f..1144d5152847 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH" + export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 8a941a719f29..0aecc43d1e53 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 |