artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove stdenv.lib

Browse source
This commit is contained in:
Artemis Tosini 2021-06-14 14:21:44 +00:00
parent 7bb797283b
commit 529b0404ec
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
externals/packages/fujproj/default.nix vendored
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, libftdi1 }: { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libusb1, libftdi1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fujprog"; pname = "fujprog";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libftdi1 libusb1 ]; buildInputs = [ libftdi1 libusb1 ];
meta = with stdenv.lib; { meta = with lib; {
description = "FPGA JTAG programmer for ULX2/3S boards"; description = "FPGA JTAG programmer for ULX2/3S boards";
homepage = "https://github.com/kost/fujprog"; homepage = "https://github.com/kost/fujprog";
license = licenses.bsd2; license = licenses.bsd2;

8
externals/packages/hll2300d/default.nix vendored
View file

@ -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 let
version = "3.2.0-1"; version = "3.2.0-1";
lprdeb = fetchurl { lprdeb = fetchurl {
@ -41,7 +41,7 @@ stdenv.mkDerivation {
$out/opt/brother/Printers/HLL2300D/cupswrapper/paperconfigml1 \ $out/opt/brother/Printers/HLL2300D/cupswrapper/paperconfigml1 \
; do ; do
wrapProgram $f \ wrapProgram $f \
--prefix PATH : ${stdenv.lib.makeBinPath [ --prefix PATH : ${lib.makeBinPath [
coreutils coreutils
ghostscript ghostscript
gnugrep gnugrep
@ -56,10 +56,10 @@ stdenv.mkDerivation {
ln -s $out/opt/brother/Printers/HLL2300D/cupswrapper/brother-HLL2300D-cups-en.ppd $out/share/cups/model/ 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 \ 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/"; homepage = "http://www.brother.com/";
description = "Brother hl-l2300dw printer driver"; description = "Brother hl-l2300dw printer driver";
license = licenses.unfree; license = licenses.unfree;

3
externals/packages/jlink/default.nix vendored
View file

@ -1,4 +1,5 @@
{ stdenv { stdenv
, lib
, fetchurl , fetchurl
, autoPatchelfHook , autoPatchelfHook
, substituteAll , substituteAll
@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
patchelf --add-needed libudev.so.1 $out/JLink/libjlinkarm.so patchelf --add-needed libudev.so.1 $out/JLink/libjlinkarm.so
''; '';
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://www.segger.com/downloads/jlink"; homepage = "https://www.segger.com/downloads/jlink";
description = "SEGGER J-Link"; description = "SEGGER J-Link";
license = licenses.unfree; license = licenses.unfree;