diff --git a/pkgs/vesc-tool/firmware.nix b/pkgs/vesc-tool/firmware.nix index 50613f9..0f84683 100644 --- a/pkgs/vesc-tool/firmware.nix +++ b/pkgs/vesc-tool/firmware.nix @@ -1,12 +1,11 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , gcc-arm-embedded-7 , python311 , git }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vesc-firmware"; version = "master"; @@ -22,13 +21,6 @@ stdenv.mkDerivation rec { gcc-arm-embedded-7 python311 git - # bash - # libsForQt5.qmake - # libsForQt5.qtconnectivity - # libsForQt5.qtgamepad - # libsForQt5.qtlocation - # libsForQt5.qtquickcontrols2 - # libsForQt5.qtserialport ]; buildCommand = '' diff --git a/pkgs/vesc-tool/tool.nix b/pkgs/vesc-tool/tool.nix index ee9f906..0b3a1c1 100644 --- a/pkgs/vesc-tool/tool.nix +++ b/pkgs/vesc-tool/tool.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , libsForQt5 , vesc-firmware @@ -17,14 +16,13 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vesc_tool"; version = "master"; src = fetchFromGitHub { owner = "vedderb"; repo = "vesc_tool"; - #rev = "f3c6fe5f5dcf0cb2fba7676204ea3db1dc8ff4ee"; # release_6_02 rev = "4a0edea5846d973e5da510fbe11ce009aaf21a96"; sha256 = "18ue6YBVcggr4qyHpCorrh01oeo4i58Jgp9Twaq+DlI="; @@ -49,11 +47,6 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - tempdir="$(mktemp -d)" - cp -r "$src/." "$tempdir/" - chmod -R +w "$tempdir" - cd "$tempdir" - mkdir -p res/firmwares/ cp ${qresource} res/firmwares/res_fw.qrc cp ${vesc-firmware}/*.bin res/firmwares @@ -65,9 +58,4 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp build/lin/* $out/bin ''; - - #postFixup = '' - # #wrapQtApp $out/bin/vesc_tool_6.05 - # #Builder called die: Cannot wrap '/nix/store/yppigini483d9kj8sn1cbjxp4cy81qqj-vesc_tool-master/bin/vesc_tool_6.02' because it is not an executable file - #''; }