From 8431594f2539bcb1e9ff833514c28dd06a319c23 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Sat, 13 Jan 2024 23:22:32 +0100 Subject: [PATCH 1/2] stm32cubemx: wrap with FHSEnv --- .../embedded/stm32/stm32cubemx/default.nix | 157 +++++++++++------- 1 file changed, 94 insertions(+), 63 deletions(-) diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 5cab499f7c88..f85167e7a4cc 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,84 +1,115 @@ { fdupes +, buildFHSEnv , fetchzip , icoutils , imagemagick , jdk17 , lib , makeDesktopItem -, stdenv +, stdenvNoCC }: let iconame = "STM32CubeMX"; -in -stdenv.mkDerivation rec { - pname = "stm32cubemx"; - version = "6.10.0"; + package = stdenvNoCC.mkDerivation rec { + pname = "stm32cubemx"; + version = "6.10.0"; - src = fetchzip { - url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-B5Sf+zM7h9BiFqDYrLS0JdqZi3dGy6H9gAaJIN3izeM="; - stripRoot = false; - }; + src = fetchzip { + url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; + sha256 = "sha256-B5Sf+zM7h9BiFqDYrLS0JdqZi3dGy6H9gAaJIN3izeM="; + stripRoot = false; + }; - nativeBuildInputs = [ fdupes icoutils imagemagick ]; - desktopItem = makeDesktopItem { - name = "STM32CubeMX"; - exec = "stm32cubemx"; - desktopName = "STM32CubeMX"; - categories = [ "Development" ]; - icon = "stm32cubemx"; - comment = meta.description; - terminal = false; - startupNotify = false; - mimeTypes = [ - "x-scheme-handler/sgnl" - "x-scheme-handler/signalcaptcha" - ]; - }; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; + desktopItem = makeDesktopItem { + name = "STM32CubeMX"; + exec = "stm32cubemx"; + desktopName = "STM32CubeMX"; + categories = [ "Development" ]; + icon = "stm32cubemx"; + comment = meta.description; + terminal = false; + startupNotify = false; + mimeTypes = [ + "x-scheme-handler/sgnl" + "x-scheme-handler/signalcaptcha" + ]; + }; - buildCommand = '' - mkdir -p $out/{bin,opt/STM32CubeMX,share/applications} + buildCommand = '' + mkdir -p $out/{bin,opt/STM32CubeMX,share/applications} - cp -r $src/MX/. $out/opt/STM32CubeMX/ - chmod +rx $out/opt/STM32CubeMX/STM32CubeMX + cp -r $src/MX/. $out/opt/STM32CubeMX/ + chmod +rx $out/opt/STM32CubeMX/STM32CubeMX - cat << EOF > $out/bin/${pname} - #!${stdenv.shell} - ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX - EOF - chmod +x $out/bin/${pname} + cat << EOF > $out/bin/${pname} + #!${stdenvNoCC.shell} + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + EOF + chmod +x $out/bin/${pname} - icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico - fdupes -dN . > /dev/null - ls - for size in 16 24 32 48 64 128 256; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ $size -eq 256 ]; then - mv ${iconame}_*_"$size"x"$size"x32.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - else - convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - fi - done; + icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico + fdupes -dN . > /dev/null + ls + for size in 16 24 32 48 64 128 256; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ $size -eq 256 ]; then + mv ${iconame}_*_"$size"x"$size"x32.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + else + convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + fi + done; - cp ${desktopItem}/share/applications/*.desktop $out/share/applications - ''; - - meta = with lib; { - description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; - longDescription = '' - A graphical tool that allows a very easy configuration of STM32 - microcontrollers and microprocessors, as well as the generation of the - corresponding initialization C code for the Arm® Cortex®-M core or a - partial Linux® Device Tree for Arm® Cortex®-A core), through a - step-by-step process. + cp ${desktopItem}/share/applications/*.desktop $out/share/applications ''; - homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = with maintainers; [ angaz wucke13 ]; - platforms = platforms.all; + + meta = with lib; { + description = "A graphical tool for configuring STM32 microcontrollers and microprocessors"; + longDescription = '' + A graphical tool that allows a very easy configuration of STM32 + microcontrollers and microprocessors, as well as the generation of the + corresponding initialization C code for the Arm® Cortex®-M core or a + partial Linux® Device Tree for Arm® Cortex®-A core), through a + step-by-step process. + ''; + homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.unfree; + maintainers = with maintainers; [ angaz wucke13 ]; + platforms = platforms.all; + }; }; + in + buildFHSEnv { + inherit (package) pname meta; + runScript = "${package.outPath}/bin/stm32cubemx"; + targetPkgs = pkgs: + with pkgs; [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libGL + libudev0-shim + libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; } From 2769038b99d9381f9e14589eea17b1edf894e449 Mon Sep 17 00:00:00 2001 From: Asmir A Date: Mon, 15 Jan 2024 20:41:08 +0100 Subject: [PATCH 2/2] stm32cubemx: change platforms from all to x86_64-linux --- pkgs/development/embedded/stm32/stm32cubemx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index f85167e7a4cc..4bcad690bbbd 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -79,7 +79,7 @@ let sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; maintainers = with maintainers; [ angaz wucke13 ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" ]; }; }; in