diff --git a/externals/packages/fujproj/default.nix b/externals/packages/fujproj/default.nix index 748668d..9bc272f 100644 --- a/externals/packages/fujproj/default.nix +++ b/externals/packages/fujproj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, libftdi1 }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libusb1, libftdi1 }: stdenv.mkDerivation rec { pname = "fujprog"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libftdi1 libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "FPGA JTAG programmer for ULX2/3S boards"; homepage = "https://github.com/kost/fujprog"; license = licenses.bsd2; diff --git a/externals/packages/hll2300d/default.nix b/externals/packages/hll2300d/default.nix index 27a63ed..d00a543 100644 --- a/externals/packages/hll2300d/default.nix +++ b/externals/packages/hll2300d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which }: +{ stdenv, lib, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, perl, gnugrep, which }: let version = "3.2.0-1"; lprdeb = fetchurl { @@ -41,7 +41,7 @@ stdenv.mkDerivation { $out/opt/brother/Printers/HLL2300D/cupswrapper/paperconfigml1 \ ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ coreutils ghostscript gnugrep @@ -56,10 +56,10 @@ stdenv.mkDerivation { ln -s $out/opt/brother/Printers/HLL2300D/cupswrapper/brother-HLL2300D-cups-en.ppd $out/share/cups/model/ wrapProgram $out/opt/brother/Printers/HLL2300D/lpd/filter_HLL2300D \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } + --prefix PATH ":" ${lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] } ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother hl-l2300dw printer driver"; license = licenses.unfree; diff --git a/externals/packages/jlink/default.nix b/externals/packages/jlink/default.nix index e0f4903..852d7b6 100644 --- a/externals/packages/jlink/default.nix +++ b/externals/packages/jlink/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , autoPatchelfHook , substituteAll @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { patchelf --add-needed libudev.so.1 $out/JLink/libjlinkarm.so ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.segger.com/downloads/jlink"; description = "SEGGER J-Link"; license = licenses.unfree;