diff options
author | happysalada <raphael@megzari.com> | 2021-05-08 19:14:30 +0900 |
---|---|---|
committer | Raphael Megzari <raphael@megzari.com> | 2021-05-16 10:22:12 +0900 |
commit | 4a9b0f0eb450d7bef5db5c05c2086b24aaecf05c (patch) | |
tree | 44637f4cd968ab3be7392bcfc55cf6c6a60ee822 /pkgs/development/arduino | |
parent | 8d9ae3d14805b0f19fb99c3258f2792ee42e4d41 (diff) |
arduino-cli: 0.12.1 -> 0.18.1 ; fix darwin build
Diffstat (limited to 'pkgs/development/arduino')
-rw-r--r-- | pkgs/development/arduino/arduino-cli/default.nix | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index 95586d064d96f..9629d90a3453f 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.12.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "1jlxs4szss2250zp8rz4bislgnzvqhxyp6z48dhx7zaam03hyf0w"; + sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8="; }; subPackages = [ "." ]; - vendorSha256 = "03yj2iar63qm10fw3jh9fvz57c2sqcmngb0mj5jkhbnwf8nl7mhc"; + vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4="; doCheck = false; @@ -32,15 +32,20 @@ let }; +in +if stdenv.isLinux then # buildFHSUserEnv is needed because the arduino-cli downloads compiler # toolchains from the internet that have their interpreters pointed at # /lib64/ld-linux-x86-64.so.2 -in buildFHSUserEnv { - inherit (pkg) name meta; - - runScript = "${pkg.outPath}/bin/arduino-cli"; - - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - ''; -} + buildFHSUserEnv + { + inherit (pkg) name meta; + + runScript = "${pkg.outPath}/bin/arduino-cli"; + + extraInstallCommands = '' + mv $out/bin/$name $out/bin/arduino-cli + ''; + } +else + pkg |