treewide: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-15 20:21:58 +07:00
parent a9bb54359e
commit badf51221d
977 changed files with 2613 additions and 2613 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, pkgconfig
, removeReferencesTo
@@ -25,7 +25,7 @@ assert enableSystemd -> systemd != null;
### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
### works at least for your platform.
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "cups";

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep
{ lib, stdenv, fetchurl, makeWrapper, cups, perl, coreutils, gnused, gnugrep
, brgenml1lpr, debugLvl ? "0"}:
/*
@@ -117,8 +117,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother BrGenML1 CUPS wrapper driver";
homepage = "http://www.brother.com";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ jraygauthier ];
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}:
{ lib, stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}:
/*
[Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html).
@@ -28,7 +28,7 @@
*/
let
myPatchElf = file: with stdenv.lib; ''
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
${file}
@@ -86,8 +86,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother BrGenML1 LPR driver";
homepage = "http://www.brother.com";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.unfreeRedistributable;
maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
platforms = lib.platforms.linux;
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ jraygauthier ];
};
}

View File

@@ -37,7 +37,7 @@ in rec {
--replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/lpd/filter_${model} \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
# need to use i686 glibc here, these are 32bit proprietary binaries
@@ -48,9 +48,9 @@ in rec {
meta = {
description = "Brother ${lib.strings.toUpper model} driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.steveej ];
maintainers = [ lib.maintainers.steveej ];
};
};
@@ -70,7 +70,7 @@ in rec {
--replace "basedir =~" "basedir = \"$basedir\"; #" \
--replace "PRINTER =~" "PRINTER = \"${model}\"; #"
wrapProgram $dir/cupswrapper/brother_lpdwrapper_${model} \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
ln $dir/cupswrapper/brother_lpdwrapper_${model} $out/lib/cups/filter
@@ -80,9 +80,9 @@ in rec {
meta = {
description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.steveej ];
maintainers = [ lib.maintainers.steveej ];
};
};
}

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, cups}:
{lib, stdenv, fetchurl, cups}:
stdenv.mkDerivation rec {
name = "cups-bjnp-1.2.2";
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
Canon printer. The design is based on reverse engineering of the protocol.
'';
homepage = "http://cups-bjnp.sourceforge.net";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
let
version = "3.0.1-1";
@@ -42,10 +42,10 @@ stdenv.mkDerivation {
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter
wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
wrapProgram $out/opt/brother/Printers/HL1110/lpd/filter_HL1110 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
--prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
dpkg-deb -x ${cupsdeb} $out
@@ -59,15 +59,15 @@ stdenv.mkDerivation {
ln -s $out/opt/brother/Printers/HL1110/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4
wrapProgram $out/opt/brother/Printers/HL1110/cupswrapper/brother_lpdwrapper_HL1110 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
'';
meta = {
homepage = "http://www.brother.com/";
description = "Brother HL1110 printer driver";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1";
};
}

View File

@@ -1,4 +1,4 @@
{stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
{lib, stdenv, pkgsi686Linux, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
let
version = "3.0.1-1";
@@ -33,9 +33,9 @@ stdenv.mkDerivation {
patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1210W/inf/braddprinter
wrapProgram $out/opt/brother/Printers/HL1210W/lpd/psconvert2 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
wrapProgram $out/opt/brother/Printers/HL1210W/lpd/filter_HL1210W \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
--prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
# install cups
dpkg-deb -x ${cupsdeb} $out
@@ -49,14 +49,14 @@ stdenv.mkDerivation {
ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4
wrapProgram $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
'';
meta = {
homepage = "http://www.brother.com/";
description = "Brother HL1210W printer driver";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128";
};
}

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
let
version = "1.1.4-0";
@@ -44,10 +44,10 @@ stdenv.mkDerivation {
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw
wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
--prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
dpkg-deb -x ${cupsdeb} $out
@@ -65,14 +65,14 @@ stdenv.mkDerivation {
ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw
wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
'';
meta = {
homepage = "http://www.brother.com/";
description = "Brother hl3140cw printer driver";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128";
};
}

View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation {
$out/opt/brother/Printers/HLL2340D/cupswrapper/paperconfigml1 \
; do
wrapProgram $f \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused
]}
done
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
ln -s $out/opt/brother/Printers/HLL2340D/cupswrapper/brother-HLL2340D-cups-en.ppd $out/share/cups/model/
wrapProgram $out/opt/brother/Printers/HLL2340D/lpd/filter_HLL2340D \
--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 lib; {

View File

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
; do
#substituteInPlace $f \
wrapProgram $f \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused
]}
done
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/
wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \
--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 lib; {

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:
{ lib, stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:
stdenv.mkDerivation rec {
pname = "mfcj470dw-cupswrapper";
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.brother.com/";
description = "Brother MFC-J470DW CUPS wrapper driver";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128";
maintainers = [ stdenv.lib.maintainers.yochai ];
maintainers = [ lib.maintainers.yochai ];
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
{ lib, stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
stdenv.mkDerivation rec {
pname = "mfcj470dw-cupswrapper";
@@ -28,18 +28,18 @@ stdenv.mkDerivation rec {
ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
--prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] }
'';
meta = {
homepage = "http://www.brother.com/";
description = "Brother MFC-J470DW LPR driver";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128";
maintainers = [ stdenv.lib.maintainers.yochai ];
maintainers = [ lib.maintainers.yochai ];
};
}

View File

@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
ln -s $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw
wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused gawk ] }
--prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused gawk ] }
wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \
--prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] }
--prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] }
'';
meta = with lib; {

View File

@@ -1,4 +1,4 @@
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }:
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }:
stdenv.mkDerivation rec {
name = "mfcl2700dncupswrapper-${meta.version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
@@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2700DN CUPS wrapper driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.tv ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.tv ];
platforms = lib.platforms.linux;
version = "3.2.0-1";
};
}

View File

@@ -1,4 +1,4 @@
{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:
{ lib, stdenv, coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, which }:
stdenv.mkDerivation rec {
pname = "mfcl2700dnlpr";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #"
wrapProgram $dir/lpd/filter_MFCL2700DN \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2700DN LPR driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.tv ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.tv ];
platforms = [ "i686-linux" ];
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:
{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:
stdenv.mkDerivation rec {
pname = "mfcl2720dwcupswrapper";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
--replace /usr/bin/perl ${perl}/bin/perl
wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2720DW \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2720DW CUPS wrapper driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.xeji ];
maintainers = [ lib.maintainers.xeji ];
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
{ pkgs, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
stdenv.mkDerivation rec {
pname = "mfcl2720dwlpr";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"MFCL2720DW\"; #"
wrapProgram $dir/lpd/filter_MFCL2720DW \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2720DW lpr driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.xeji ];
maintainers = [ lib.maintainers.xeji ];
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
{ lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:
stdenv.mkDerivation rec {
pname = "mfcl2740dwcupswrapper";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--replace /usr/bin/perl ${perl}/bin/perl
wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2740DW \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2740DW CUPS wrapper driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.enzime ];
maintainers = [ lib.maintainers.enzime ];
};
}

View File

@@ -1,4 +1,4 @@
{ pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
{ pkgsi686Linux, lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:
stdenv.mkDerivation rec {
pname = "mfcl2740dwlpr";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"MFCL2740DW\"; #"
wrapProgram $dir/lpd/filter_MFCL2740DW \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils ghostscript gnugrep gnused which
]}
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L2740DW lpr driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.enzime ];
maintainers = [ lib.maintainers.enzime ];
};
}

View File

@@ -1,5 +1,5 @@
{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper,
mfcl8690cdwlpr, perl, stdenv}:
mfcl8690cdwlpr, perl, lib, stdenv}:
stdenv.mkDerivation rec {
pname = "mfcl8690cdwcupswrapper";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #"
wrapProgram $dir/cupswrapper/brother_lpdwrapper_mfcl8690cdw \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]}
--prefix PATH : ${lib.makeBinPath [ coreutils gnugrep gnused ]}
mkdir -p $out/lib/cups/filter
mkdir -p $out/share/cups/model
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L8690CDW CUPS wrapper driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.fuzzy-id ];
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.fuzzy-id ];
};
}

View File

@@ -1,5 +1,5 @@
{ coreutils, dpkg, fetchurl, file, ghostscript, gnugrep, gnused,
makeWrapper, perl, pkgs, stdenv, which }:
makeWrapper, perl, pkgs, lib, stdenv, which }:
stdenv.mkDerivation rec {
pname = "mfcl8690cdwlpr";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--replace "PRINTER =~" "PRINTER = \"mfcl8690cdw\"; #"
wrapProgram $filter \
--prefix PATH : ${stdenv.lib.makeBinPath [
--prefix PATH : ${lib.makeBinPath [
coreutils file ghostscript gnugrep gnused which
]}
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Brother MFC-L8690CDW LPR printer driver";
homepage = "http://www.brother.com/";
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.fuzzy-id ];
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.fuzzy-id ];
platforms = [ "i686-linux" ];
};
}

View File

@@ -87,10 +87,10 @@ in stdenv.mkDerivation rec {
preFixup = ''
for bin in "$out/bin/"*; do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin"
patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin"
done
patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/

View File

@@ -70,10 +70,10 @@ in stdenv.mkDerivation rec {
preFixup = ''
for bin in "$out/bin/"*; do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin"
patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$bin"
done
patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
patchelf --set-rpath "$out/lib:${lib.getLib cups}/lib" "$out/lib/libscmssc.so"
patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/

View File

@@ -16,7 +16,7 @@
# Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
# to see what will break when upgrading. Consider a new versioned attribute.
let
cups' = stdenv.lib.getLib cups;
cups' = lib.getLib cups;
in stdenv.mkDerivation rec {
pname = "samsung-UnifiedLinuxDriver";
version = "4.00.39";

View File

@@ -18,7 +18,7 @@
let
installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
in stdenv.mkDerivation rec {
pname = "samsung-UnifiedLinuxDriver";
version = "4.01.17";

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
{ lib, stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
, mupdf
}:
let
binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];
in stdenv.mkDerivation rec {
pname = "cups-filters";
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters";
description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}