alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "arduino: new package"

Browse source 
This reverts commit ca982158bf.

@bjornfor
This commit is contained in:
Domen Kožar 2015-02-04 13:45:02 +01:00
parent d75a91ef1e
commit bb7246be3e
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/arduino/arduino-core/default.nix
View file

@ -1,13 +1,9 @@
{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file, libusb { stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep, file }:
, withGui ? false, gtk2 ? null
}:
assert withGui -> gtk2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.6"; version = "1.0.6";
name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}"; name = "arduino-core";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arduino"; owner = "arduino";
@ -26,16 +22,12 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/share/arduino 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 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. # Fixup "/lib64/ld-linux-x86-64.so.2" like references in ELF executables.
echo "running patchelf on prebuilt binaries:" echo "running patchelf on prebuilt binaries:"
find "$out" | while read filepath; do find "$out" | while read filepath; do
@ -49,13 +41,10 @@ stdenv.mkDerivation rec {
test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; }
fi fi
done done
patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ stdenv.glibc libusb ]} \
"$out/share/arduino/hardware/tools/avrdude"
''; '';
meta = { meta = {
description = "Open-source electronics prototyping platform"; description = "Libraries for the open-source electronics prototyping platform";
homepage = http://arduino.cc/; homepage = http://arduino.cc/;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ]; maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ];

3
pkgs/top-level/all-packages.nix
View file

@ -499,12 +499,9 @@ let
arcanist = callPackage ../development/tools/misc/arcanist {}; arcanist = callPackage ../development/tools/misc/arcanist {};
arduino = arduino-core.override { withGui = true; };
arduino-core = callPackage ../development/arduino/arduino-core { arduino-core = callPackage ../development/arduino/arduino-core {
jdk = jdk; jdk = jdk;
jre = jdk; jre = jdk;
withGui = false;
}; };
apitrace = callPackage ../applications/graphics/apitrace {}; apitrace = callPackage ../applications/graphics/apitrace {};