about summary refs log tree commit diff
path: root/pkgs/development/embedded
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-04-27 10:30:24 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2024-04-27 10:30:24 +0200
commit160dff0bae914f765273bedd9d2bd85eadecdb39 (patch)
tree467d436b88d661be01d0fdb2b6469c7c899262ce /pkgs/development/embedded
parent6e3e054572e1b79d50e7b749ce26b2d12b2ccd09 (diff)
parent60cb88cc491e819c16fc579fd697d33defd2a8e3 (diff)
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/embedded')
-rw-r--r--pkgs/development/embedded/arduino/arduino-core/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix
index 965985339057e..43e6292143a4a 100644
--- a/pkgs/development/embedded/arduino/arduino-core/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/default.nix
@@ -4,6 +4,7 @@
 , fetchurl
 , jdk
 , ant
+, stripJavaArchivesHook
 , libusb-compat-0_1
 , libusb1
 , unzip
@@ -112,7 +113,7 @@ 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 wrapGAppsHook3 unzip ];
+  nativeBuildInputs = [ glib stripJavaArchivesHook wrapGAppsHook3 unzip ];
   buildInputs = [
     jdk
     ant