diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-17 19:11:59 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-01-17 19:11:59 +0100 |
| commit | cf2a67fef385d021ced8a63048c0cf88f2d8dbc5 (patch) | |
| tree | 023d243734d46147fd7738d3ef353b3dbd76a5ac /pkgs/development/arduino/arduino-core | |
| parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) | |
| download | nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.gz nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.bz2 nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.lz nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.xz nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.zst nixpkgs-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.zip | |
pkgs/development: stdenv.lib -> lib
this takes care of the following folders in pkgs/development: * arduino * chez-modules * go-packages * guile-modules * idris-modules * perl-modules * r-modules * ruby-modules
Diffstat (limited to 'pkgs/development/arduino/arduino-core')
| -rw-r--r-- | pkgs/development/arduino/arduino-core/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 081c7c7c638..4c440ab97db 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -47,7 +47,7 @@ let ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; - teensy_libpath = stdenv.lib.makeLibraryPath [ + teensy_libpath = lib.makeLibraryPath [ atk cairo expat @@ -76,7 +76,7 @@ let else throw "${stdenv.hostPlatform.system} is not supported in teensy"; flavor = (if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + + lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { version = "1.8.13"; @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { zlib ncurses5 readline - ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; + ] ++ lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { cp -r ./build/linux/work/* "$out/share/arduino/" echo -n ${version} > $out/share/arduino/lib/version.txt - ${stdenv.lib.optionalString withGui '' + ${lib.optionalString withGui '' mkdir -p $out/bin substituteInPlace $out/share/arduino/arduino \ --replace "JAVA=java" "JAVA=$javaPath/java" \ @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { --replace '<ICON_NAME>' "$out/share/arduino/icons/128x128/apps/arduino.png" ''} - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Back up the original jars mv $out/share/arduino/lib/arduino-core.jar $out/share/arduino/lib/arduino-core.jar.bak mv $out/share/arduino/lib/pde.jar $out/share/arduino/lib/pde.jar.bak @@ -235,7 +235,7 @@ stdenv.mkDerivation rec { mkdir $out/lib/ ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5 - ${stdenv.lib.optionalString withTeensyduino '' + ${lib.optionalString withTeensyduino '' # Patch the Teensy loader binary patchelf --debug \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ |