git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107530 from raboof/arduino-gtk3
commit7ea55a099a721e27b7d0b5f1d826e2e068e6c9ba authorDoron Behar <doron.behar@gmail.com> dateFri 25 Dec 2020, 12:38 (6 years ago) parentce8c836022d720
1 file changed+6−4
pkgs/development/arduino/arduino-core/default.nix+6−4
pkgs/development/arduino/arduino-core/default.nix+6−4
@@ -11,7 +11,8 @@
1111, ncurses
1212, readline
1313, withGui ? false
14−, gtk2 ? null
14+, gtk3 ? null
15+, wrapGAppsHook
1516, withTeensyduino ? false
1617 /* Packages needed for Teensyduino */
1718, upx
@@ -29,7 +30,7 @@
2930, udev
3031}:
3132
32−assert withGui -> gtk2 != null;
33+assert withGui -> gtk3 != null && wrapGAppsHook != null;
3334assert withTeensyduino -> withGui;
3435let
3536 externalDownloads = import ./downloads.nix {
@@ -55,7 +56,7 @@ let
5556 gcc.cc.lib
5657 gdk-pixbuf
5758 glib
58− gtk2
59+ gtk3
5960 libpng12
6061 libusb-compat-0_1
6162 pango
@@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
111112 };
112113
113114
115+ nativeBuildInputs = [ wrapGAppsHook ];
114116 buildInputs = [
115117 jdk
116118 ant
@@ -149,7 +151,7 @@ stdenv.mkDerivation rec {
149151
150152 # This will be patched into `arduino` wrapper script
151153 # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH
152− dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ];
154+ dynamicLibraryPath = lib.makeLibraryPath [ gtk3 ];
153155 javaPath = lib.makeBinPath [ jdk ];
154156
155157 # Everything else will be patched into rpath