diff options
Diffstat (limited to 'nixpkgs/pkgs/development/arduino')
| -rw-r--r-- | nixpkgs/pkgs/development/arduino/arduino-core/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/arduino/platformio/core.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix index 4c440ab97dbb..529be6e2a56e 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix @@ -23,6 +23,7 @@ , glib , pango , gdk-pixbuf +, gtk2 , libpng12 , expat , freetype @@ -56,7 +57,7 @@ let gcc.cc.lib gdk-pixbuf glib - gtk3 + gtk2 libpng12 libusb-compat-0_1 pango @@ -115,13 +116,12 @@ stdenv.mkDerivation rec { # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH, # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS # so 'save as...' works: - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook unzip ]; buildInputs = [ jdk ant libusb-compat-0_1 libusb1 - unzip zlib ncurses5 readline @@ -240,7 +240,7 @@ stdenv.mkDerivation rec { patchelf --debug \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "${teensy_libpath}" \ - $out/share/arduino/hardware/tools/teensy + $out/share/arduino/hardware/tools/teensy{,_ports,_reboot,_restart,_serialmon} ''} ''; diff --git a/nixpkgs/pkgs/development/arduino/platformio/core.nix b/nixpkgs/pkgs/development/arduino/platformio/core.nix index 733e7e0b1462..17e87f2cb6c5 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/core.nix +++ b/nixpkgs/pkgs/development/arduino/platformio/core.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildPythonApplication, fetchpatch -, bottle, click, colorama, semantic-version +{ stdenv, lib, buildPythonApplication, bottle +, click, click-completion, colorama, semantic-version , lockfile, pyserial, requests , tabulate, pyelftools, marshmallow , pytest, tox, jsondiff @@ -79,8 +79,8 @@ in buildPythonApplication rec { inherit version src; propagatedBuildInputs = [ - bottle click colorama git lockfile - pyserial requests semantic-version + bottle click click-completion colorama git + lockfile pyserial requests semantic-version tabulate pyelftools marshmallow ]; |