From 263a79fbde87f6e00046e6633c407dd2086b555b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 8 Aug 2023 02:19:08 +0200 Subject: [PATCH] fusee-launcher: respect targetPrefix of arm-embedded toolchain --- pkgs/development/tools/fusee-launcher/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 08cf6caae3ef..117bd0c9450e 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,6 +6,10 @@ , makeWrapper } : +let + arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc; +in + stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; @@ -17,6 +21,10 @@ stdenv.mkDerivation { sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm"; }; + makeFlags = [ + "CROSS_COMPILE=${arm-embedded-cc.targetPrefix}" + ]; + installPhase = '' mkdir -p $out/bin $out/share cp fusee-launcher.py $out/bin/fusee-launcher @@ -28,7 +36,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; - nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ]; + nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ]; buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ];