diff options
author | Domen Kožar <domen@dev.si> | 2015-02-04 13:45:02 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-02-04 13:49:27 +0100 |
commit | bb7246be3e8b509a5f57682638a0f7b7e03c9ffa (patch) | |
tree | 84972db2337436f4db0b7bdb44e4d940fac6a1df /pkgs/development/arduino | |
parent | d75a91ef1e4f2a9ea768e4a775907a8dff151c0b (diff) |
Revert "arduino: new package"
This reverts commit ca982158bf33cef9398f86723d862da0603466da.
@bjornfor
Diffstat (limited to 'pkgs/development/arduino')
-rw-r--r-- | pkgs/development/arduino/arduino-core/default.nix | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 7addf79a39c6..a5b8980e32cf 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,13 +1,9 @@ -{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file, libusb -, withGui ? false, gtk2 ? null -}: - -assert withGui -> gtk2 != null; +{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file }: stdenv.mkDerivation rec { version = "1.0.6"; - name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}"; + name = "arduino-core"; src = fetchFromGitHub { owner = "arduino"; @@ -26,16 +22,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/arduino - cp -r ./build/linux/work/* "$out/share/arduino/" + cp -r ./build/linux/work/hardware/ $out/share/arduino + cp -r ./build/linux/work/libraries/ $out/share/arduino + cp -r ./build/linux/work/tools/ $out/share/arduino + cp -r ./build/linux/work/lib/ $out/share/arduino echo ${version} > $out/share/arduino/lib/version.txt - ${stdenv.lib.optionalString withGui '' - mkdir -p "$out/bin" - sed -i -e "s|^java|${jdk}/bin/java|" "$out/share/arduino/arduino" - sed -i -e "s|^LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${gtk2}/lib:|" "$out/share/arduino/arduino" - ln -sr "$out/share/arduino/arduino" "$out/bin/arduino" - ''} - # Fixup "/lib64/ld-linux-x86-64.so.2" like references in ELF executables. echo "running patchelf on prebuilt binaries:" find "$out" | while read filepath; do @@ -49,13 +41,10 @@ stdenv.mkDerivation rec { test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } fi done - - patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ stdenv.glibc libusb ]} \ - "$out/share/arduino/hardware/tools/avrdude" ''; meta = { - description = "Open-source electronics prototyping platform"; + description = "Libraries for the open-source electronics prototyping platform"; homepage = http://arduino.cc/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ]; |