diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f50090576..cd83ad728b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -830,7 +830,10 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { }; + axoloti = callPackage ../applications/audio/axoloti { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { inherit (darwin) libobjc; @@ -7998,7 +8001,10 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -8034,7 +8040,10 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { }; + inav = callPackage ../development/misc/stm32/inav { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -8192,6 +8201,8 @@ with pkgs; blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; bloaty = callPackage ../development/tools/bloaty { }; @@ -12206,7 +12217,11 @@ with pkgs; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - simavr = callPackage ../development/tools/simavr { }; + simavr = callPackage ../development/tools/simavr { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + avrlibc = pkgsCross.avr.libcCross; + }; simgear = callPackage ../development/libraries/simgear { }; @@ -18301,7 +18316,10 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { }; + opentx = callPackage ../applications/misc/opentx { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -21982,7 +22000,8 @@ with pkgs; gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; gnuk = callPackage ../misc/gnuk { - gcc-arm-embedded = gcc-arm-embedded-4_9; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; greybird = callPackage ../misc/themes/greybird { }; |