diff options
Diffstat (limited to 'nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index af496df582c1..a9384d9b2b8b 100644 --- a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: -# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 -# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: -# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 -# If you're updating this derivation, check the link above to see if it's been fixed upstream -# and try replacing all occurrences of jdk11 with jre and test whether it works. +{ fdupes +, fetchzip +, icoutils +, imagemagick +, jdk17 +, lib +, makeDesktopItem +, stdenv +}: + let iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.1"; + version = "6.9.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; + sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick ]; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; desktopItem = makeDesktopItem { name = "STM32CubeMX"; exec = "stm32cubemx"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ angaz wucke13 ]; platforms = platforms.all; }; } |