public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-16 17:58:11 +07:00
parent a9bb54359e
commit badf51221d
977 changed files with 2613 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/default.nix
+2 -2
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";
pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+5 -5
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 ];
};
}
pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix
+6 -6
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 ];
};
};
}
pkgs/misc/cups/drivers/cups-bjnp/default.nix
+2 -2
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;
};
}
pkgs/misc/cups/drivers/hl1110/default.nix
+6 -6
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";
};
}
pkgs/misc/cups/drivers/hl1210w/default.nix
+6 -6
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";
};
}
pkgs/misc/cups/drivers/hl3140cw/default.nix
+6 -6
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";
};
}
pkgs/misc/cups/drivers/hll2340dw/default.nix
+2 -2
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; {
pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+2 -2
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; {
pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+6 -6
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 ];
};
}
pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+2 -2
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; {
pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
+5 -5
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";
};
}
pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix
+4 -4
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" ];
};
}
pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+4 -4
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 ];
};
}
pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
+5 -5
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 ];
};
}
pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
+4 -4
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" ];
};
}
pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+2 -2
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/
pkgs/misc/cups/drivers/samsung/1.00.37.nix
+2 -2
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/
pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+1 -1
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";
pkgs/misc/cups/drivers/samsung/4.01.17.nix
+1 -1
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";
pkgs/misc/cups/filters.nix
+4 -4
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;
};
}
pkgs/misc/documentation-highlighter/default.nix
+4 -4
View File
@@ -1,11 +1,11 @@
{ stdenv, runCommand }:
{ lib, stdenv, runCommand }:
runCommand "documentation-highlighter" {
meta = {
description = "Highlight.js sources for the Nix Ecosystem's documentation";
homepage = "https://highlightjs.org";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.grahamc ];
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.grahamc ];
};
} ''
cp -r ${./.} $out
pkgs/misc/drivers/epkowa/default.nix
+7 -7
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, fetchpatch
, makeWrapper
@@ -19,8 +19,8 @@
}:
let common_meta = {
homepage = "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX";
license = with stdenv.lib.licenses; epson;
platforms = with stdenv.lib.platforms; linux;
license = with lib.licenses; epson;
platforms = with lib.platforms; linux;
};
in
############################
@@ -261,7 +261,7 @@ let plugins = {
in
let fwdir = symlinkJoin {
name = "esci-firmware-dir";
paths = stdenv.lib.mapAttrsToList (name: value: value + /share/esci) plugins;
paths = lib.mapAttrsToList (name: value: value + /share/esci) plugins;
};
in
let iscan-data = stdenv.mkDerivation rec {
@@ -337,7 +337,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin
registry=$out/bin/iscan-registry;
'' +
stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList
lib.concatStrings (lib.mapAttrsToList
(name: value: ''
plugin=${value};
${value.passthru.registrationCommand}
@@ -349,7 +349,7 @@ stdenv.mkDerivation rec {
Includes gui-less iscan (aka. Image Scan! for Linux).
Supported hardware: at least :
'' +
stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
maintainers = with stdenv.lib.maintainers; [ symphorien dominikh ];
lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
maintainers = with lib.maintainers; [ symphorien dominikh ];
};
}
pkgs/misc/drivers/epson-alc1100/default.nix
+2 -2
View File
@@ -33,12 +33,12 @@ in
postFixup = ''
patchelf --set-interpreter ${pkgsi686Linux.glibc}/lib/ld-linux.so.2 \
--set-rpath "${stdenv.lib.makeLibraryPath [
--set-rpath "${lib.makeLibraryPath [
pkgsi686Linux.glibc
"$out"
]}" $out/bin/alc1100
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [
patchelf --set-rpath "${lib.makeLibraryPath [
pkgsi686Linux.glibc
]}" $out/lib/libstdc++.so.5.0.7
pkgs/misc/drivers/foomatic-filters/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }:
{ lib, stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }:
stdenv.mkDerivation rec {
name = "foomatic-filters-4.0.17";
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Foomatic printing filters";
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
};
}
pkgs/misc/drivers/gutenprint/bin.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, rpm, cpio, zlib }:
{ lib, stdenv, fetchurl, rpm, cpio, zlib }:
/* usage: (sorry, its still impure but works!)
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
phases = "buildPhase";
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ];
libPath = lib.makeLibraryPath [ stdenv.cc.cc zlib ];
buildPhase = ''
ar -x $src data.tar.gz
pkgs/misc/drivers/hplip/3.16.11.nix
+2 -2
View File
@@ -69,7 +69,7 @@ python2Packages.buildPythonApplication {
pygobject2
reportlab
usbutils
] ++ stdenv.lib.optionals qtSupport [
] ++ lib.optionals qtSupport [
pyqt4
];
@@ -111,7 +111,7 @@ python2Packages.buildPythonApplication {
enableParallelBuilding = true;
postInstall = stdenv.lib.optionalString withPlugin ''
postInstall = lib.optionalString withPlugin ''
sh ${plugin} --noexec --keep
cd plugin_tmp
pkgs/misc/drivers/hplip/3.18.5.nix
+4 -4
View File
@@ -76,7 +76,7 @@ python2Packages.buildPythonApplication {
reportlab
usbutils
sip
] ++ stdenv.lib.optionals withQt5 [
] ++ lib.optionals withQt5 [
pyqt5
];
@@ -108,9 +108,9 @@ python2Packages.buildPythonApplication {
--with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups
--enable-policykit
${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
--disable-qt4
${stdenv.lib.optionalString withQt5 "--enable-qt5"}
${lib.optionalString withQt5 "--enable-qt5"}
"
export makeFlags="
@@ -136,7 +136,7 @@ python2Packages.buildPythonApplication {
# Running `hp-diagnose_plugin -g` can be used to diagnose
# issues with plugins.
#
postInstall = stdenv.lib.optionalString withPlugin ''
postInstall = lib.optionalString withPlugin ''
sh ${plugin} --noexec --keep
cd plugin_tmp
pkgs/misc/drivers/hplip/default.nix
+6 -6
View File
@@ -71,7 +71,7 @@ python3Packages.buildPythonApplication {
nativeBuildInputs = [
pkgconfig
removeReferencesTo
] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook;
] ++ lib.optional withQt5 qt5.wrapQtAppsHook;
pythonPath = with python3Packages; [
dbus
@@ -81,7 +81,7 @@ python3Packages.buildPythonApplication {
usbutils
sip
dbus-python
] ++ stdenv.lib.optionals withQt5 [
] ++ lib.optionals withQt5 [
pyqt5
enum-compat
];
@@ -127,9 +127,9 @@ python3Packages.buildPythonApplication {
--with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups
--enable-policykit
${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
--disable-qt4
${stdenv.lib.optionalString withQt5 "--enable-qt5"}
${lib.optionalString withQt5 "--enable-qt5"}
"
export makeFlags="
@@ -155,7 +155,7 @@ python3Packages.buildPythonApplication {
# Running `hp-diagnose_plugin -g` can be used to diagnose
# issues with plugins.
#
postInstall = stdenv.lib.optionalString withPlugin ''
postInstall = lib.optionalString withPlugin ''
sh ${plugin} --noexec --keep
cd plugin_tmp
@@ -229,7 +229,7 @@ python3Packages.buildPythonApplication {
--replace {,${util-linux}/bin/}logger \
--replace {/usr,$out}/bin
remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so)
'' + stdenv.lib.optionalString withQt5 ''
'' + lib.optionalString withQt5 ''
for f in $out/bin/hp-*;do
wrapQtApp $f
done
pkgs/misc/drivers/sundtek/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv }:
{ fetchurl, lib, stdenv }:
with stdenv.lib;
with lib;
let
version = "2016-01-26";
pkgs/misc/drivers/xwiimote/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }:
{ lib, stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }:
stdenv.mkDerivation rec {
name = "xwiimote-2";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://dvdhrm.github.io/xwiimote";
description = "Userspace utilities to control connected Nintendo Wii Remotes";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
platforms = lib.platforms.linux;
license = lib.licenses.mit;
};
postInstallPhase = ''
pkgs/misc/emulators/atari++/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ];
postFixup = ''
patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} "$out/bin/atari++"
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++"
'';
meta = with lib; {
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
'';
maintainers = [ maintainers.AndersonTorres ];
license = licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/atari800/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook
{ lib, stdenv, fetchFromGitHub, autoreconfHook
, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "atari800";
version = "4.2.0";
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
'';
maintainers = [ maintainers.AndersonTorres ];
license = licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/blastem/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }:
{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }:
let
vasm =
@@ -41,9 +41,9 @@ stdenv.mkDerivation {
meta = {
homepage = "https://www.retrodev.com/blastem/";
description = "The fast and accurate Genesis emulator";
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with lib.maintainers; [ puffnfresh ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
# Makefile:140: *** aarch64 is not a supported architecture. Stop.
badPlatforms = [ "aarch64-linux" ];
};
pkgs/misc/emulators/bsod/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, ncurses}:
{lib, stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "bsod-0.1";
@@ -23,9 +23,9 @@ stdenv.mkDerivation {
blue screen of death on the console. Errors and drivers causing the
error are selected randomly from a large set of examples.";
homepage = "http://www.vanheusden.com/bsod/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.antono ];
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.antono ];
};
}
pkgs/misc/emulators/ccemux/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
version = "1.1.1";
rev = "af12e2e4da586275ba931eae8f40a2201251bf59";
baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX";
baseUrl = "https://emux.cc/versions/${lib.substring 0 8 rev}/CCEmuX";
jar =
if useCCTweaked
then fetchurl {
pkgs/misc/emulators/cdemu/base.nix
+1 -1
View File
@@ -32,6 +32,6 @@ in stdenv.mkDerivation ({
homepage = "http://cdemu.sourceforge.net/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ bendlas ];
maintainers = with lib.maintainers; [ bendlas ];
};
} // drvParams)
pkgs/misc/emulators/cdemu/vhba.nix
+1 -1
View File
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://cdemu.sourceforge.net/about/vhba/";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ bendlas ];
maintainers = with lib.maintainers; [ bendlas ];
};
}
pkgs/misc/emulators/darcnes/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXaw }:
stdenv.mkDerivation rec {
pname = "darcnes";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = "https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/";
description = "Sega Master System, Game Gear, SG-1000, NES, ColecoVision and Apple II emulator";
# Prohibited commercial use, credit required.
license = stdenv.lib.licenses.free;
license = lib.licenses.free;
platforms = [ "i686-linux" ];
};
}
pkgs/misc/emulators/desmume/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch
{ lib, stdenv, fetchurl, fetchpatch
, pkgconfig, libtool, intltool
, libXmu
, lua
@@ -8,7 +8,7 @@
, gtk2, gtkglext, libglade
, libGLU, libpcap, SDL, zziplib }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "desmume";
pkgs/misc/emulators/dlx/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip }:
{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
name = "dlx-2012.07.08";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.davidviner.com/dlx.php";
description = "DLX Simulator";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/emulationstation/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive
, fetchpatch }:
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
meta = {
description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
homepage = "https://emulationstation.org";
maintainers = [ stdenv.lib.maintainers.edwtjo ];
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
maintainers = [ lib.maintainers.edwtjo ];
license = lib.licenses.mit;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/epsxe/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "epsxe";
pkgs/misc/emulators/fakenes/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11,
{lib, stdenv, fetchurl, allegro, openal, libGLU, libGL, zlib, hawknl, freeglut, libX11,
libXxf86vm, libXcursor, libXpm }:
stdenv.mkDerivation {
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
meta = {
homepage = "http://fakenes.sourceforge.net/";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
description = "Portable Open Source NES Emulator";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
broken = true;
};
}
pkgs/misc/emulators/fceux/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}:
{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkgconfig}:
stdenv.mkDerivation {
pname = "fceux-unstable";
@@ -32,9 +32,9 @@ stdenv.mkDerivation {
meta = {
description = "A Nintendo Entertainment System (NES) Emulator";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.scubed2 ];
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.scubed2 ];
homepage = "http://www.fceux.com/";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/firebird-emu/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
mkDerivation rec {
pname = "firebird-emu";
@@ -30,9 +30,9 @@ mkDerivation rec {
meta = {
homepage = "https://github.com/nspire-emus/firebird";
description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ pneumaticat ];
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ pneumaticat ];
# Only tested on Linux, but likely possible to build on, e.g. macOS
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/fs-uae/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig
{ lib, stdenv, fetchurl, pkgconfig
, gettext, gtk2, SDL2, zlib, glib, openal, libGLU, libGL, lua, freetype, libmpeg2, zip }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "fs-uae";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
homepage = "https://fs-uae.net";
maintainers = with stdenv.lib; [ maintainers.AndersonTorres ];
maintainers = with lib; [ maintainers.AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
pkgs/misc/emulators/hatari/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, SDL, cmake }:
{ lib, stdenv, fetchurl, zlib, SDL, cmake }:
stdenv.mkDerivation rec {
pname = "hatari";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://hatari.tuxfamily.org/";
description = "Atari ST/STE/TT/Falcon emulator";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ ];
};
}
pkgs/misc/emulators/higan/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@
, libicns, Carbon, Cocoa, OpenGL, OpenAL}:
let
inherit (stdenv.lib) optionals;
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
pkgs/misc/emulators/mame/default.nix
+1 -1
View File
@@ -61,7 +61,7 @@ in mkDerivation {
'';
installPhase = ''
make -f dist.mak PTR64=${stdenv.lib.optionalString stdenv.is64bit "1"}
make -f dist.mak PTR64=${lib.optionalString stdenv.is64bit "1"}
mkdir -p ${dest}
mv build/release/*/Release/mame/* ${dest}
pkgs/misc/emulators/mednaffe/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook
{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook
, gtk2 ? null, gtk3 ? null, mednafen }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "mednaffe";
pkgs/misc/emulators/nestopia/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
{ lib, stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg_utils
, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
}:
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://0ldsk00l.ca/nestopia/";
description = "NES emulator with a focus on accuracy";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ MP2E ];
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ MP2E ];
};
}
pkgs/misc/emulators/oberon-risc-emu/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, SDL2 }:
{ lib, stdenv, fetchFromGitHub, SDL2 }:
stdenv.mkDerivation {
pname = "oberon-risc-emu";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
mv risc $out/bin
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/pdewacht/oberon-risc-emu/";
description = "Emulator for the Oberon RISC machine";
license = licenses.isc;
pkgs/misc/emulators/openmsx/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig
{ lib, stdenv, fetchFromGitHub, pkgconfig
, python
, alsaLib, glew, libGL, libpng
, libogg, libtheora, libvorbis
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# for providing support to Nixpkgs :)
TCL_CONFIG="${tcl}/lib/";
meta = with stdenv.lib;{
meta = with lib;{
description = "The MSX emulator that aims for perfection";
longDescription = ''
OpenMSX is an emulator for the MSX home computer system. Its goal is
pkgs/misc/emulators/resim/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, cmake, qt4 }:
{ fetchFromGitHub, lib, stdenv, cmake, qt4 }:
stdenv.mkDerivation {
name = "resim";
@@ -16,5 +16,5 @@ stdenv.mkDerivation {
cp -v vc4emul/vc4emul $out/bin/vc4emul
'';
meta.license = stdenv.lib.licenses.mit;
meta.license = lib.licenses.mit;
}
pkgs/misc/emulators/retroarch/cores.nix
+14 -14
View File
@@ -6,10 +6,10 @@
let
d2u = stdenv.lib.replaceChars ["-"] ["_"];
d2u = lib.replaceChars ["-"] ["_"];
mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a:
stdenv.lib.makeOverridable stdenv.mkDerivation ((rec {
lib.makeOverridable stdenv.mkDerivation ((rec {
name = "libretro-${a.core}-${version}";
version = "2020-03-06";
@@ -62,7 +62,7 @@ let
fetchSubmodules = true;
};
in with stdenv.lib.licenses;
in with lib.licenses;
{
@@ -313,8 +313,8 @@ in with stdenv.lib.licenses;
license = gpl2;
extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
preBuild = "cd desmume/src/frontend/libretro";
makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
};
desmume2015 = mkLibRetroCore rec {
@@ -327,8 +327,8 @@ in with stdenv.lib.licenses;
description = "libretro wrapper for desmume NDS emulator from 2015";
license = gpl2;
extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
makeFlags = lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
++ lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
preBuild = "cd desmume";
};
@@ -435,7 +435,7 @@ in with stdenv.lib.licenses;
license = gpl2;
extraBuildInputs = [ libGL libGLU ];
makefile = "Makefile";
makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
meta.platforms = [ "aarch64-linux" "x86_64-linux" ];
};
@@ -505,7 +505,7 @@ in with stdenv.lib.licenses;
sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk";
};
description = "Port of Game and Watch to libretro";
license = stdenv.lib.licenses.zlib;
license = lib.licenses.zlib;
makefile = "Makefile";
};
@@ -567,7 +567,7 @@ in with stdenv.lib.licenses;
description = "Port of MAME ~2000 to libretro";
license = gpl2Plus;
makefile = "Makefile";
makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0";
makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0";
};
mame2003 = mkLibRetroCore rec {
@@ -604,7 +604,7 @@ in with stdenv.lib.licenses;
description = "Port of MAME ~2010 to libretro";
license = gpl2Plus;
makefile = "Makefile";
makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ];
makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ];
};
mame2015 = mkLibRetroCore rec {
@@ -778,7 +778,7 @@ in with stdenv.lib.licenses;
license = gpl2;
extraBuildInputs = [ libGLU libGL libpng ];
makefile = "Makefile";
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 ''
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
&& sed -i -e 's,CPUFLAGS :=,,g' Makefile
'';
@@ -810,7 +810,7 @@ in with stdenv.lib.licenses;
SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
dontAddPrefix = true;
configurePlatforms = [];
makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
};
play = mkLibRetroCore {
@@ -1091,7 +1091,7 @@ in with stdenv.lib.licenses;
license = gpl2;
makefile = "Makefile";
# Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64.
makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0";
makeFlags = lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0";
preBuild = "cd yabause/src/libretro";
};
pkgs/misc/emulators/retroarch/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
{ lib, stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
@@ -19,7 +19,7 @@
, libxkbcommon
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "retroarch-bare";
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
postInstall = optionalString withVulkan ''
wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+2 -2
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out/bin
${stdenv.lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs}
${lib.concatMapStrings (exec: "ln -s ${scriptSh exec} $out/bin/kodi-${exec.name};") execs}
'';
meta = {
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
advanced (emulation) launcher for Kodi since device input is
otherwise caught by both Kodi and the retroarch process.
'';
license = stdenv.lib.licenses.gpl3;
license = lib.licenses.gpl3;
};
}
pkgs/misc/emulators/ryujinx/default.nix
+1 -1
View File
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \
--set DOTNET_ROOT "${dotnetCorePackages.netcore_3_1}" \
--suffix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeDeps}" \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \
''${gappsWrapperArgs[@]}
for i in 16 32 48 64 96 128 256 512 1024; do
pkgs/misc/emulators/stella/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkg-config, SDL2 }:
{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2 }:
stdenv.mkDerivation rec {
pname = "stella";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib;{
meta = with lib;{
description = "An open-source Atari 2600 VCS emulator";
longDescription = ''
Stella is a multi-platform Atari 2600 VCS emulator released under
pkgs/misc/emulators/uae/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}:
{lib, stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}:
stdenv.mkDerivation rec {
name = "uae-0.8.29";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Ultimate/Unix/Unusable Amiga Emulator";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/vbam/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, cairo
, cmake
, fetchFromGitHub
@@ -46,12 +46,12 @@ stdenv.mkDerivation rec {
"-DENABLE_SDL='true'"
];
meta = with stdenv.lib; {
meta = with lib; {
description = "A merge of the original Visual Boy Advance forks";
license = licenses.gpl2;
maintainers = with maintainers; [ lassulus ];
homepage = "https://vba-m.com/";
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}
pkgs/misc/emulators/vice/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw
{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw
, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
}:
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Commodore 64, 128 and other emulators";
homepage = "http://www.viceteam.org";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sander ];
platforms = lib.platforms.linux;
};
}
pkgs/misc/emulators/wine/base.nix
+2 -2
View File
@@ -148,8 +148,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
meta = {
inherit version platforms;
homepage = "https://www.winehq.org/";
license = with stdenv.lib.licenses; [ lgpl21Plus ];
license = with lib.licenses; [ lgpl21Plus ];
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ];
maintainers = with lib.maintainers; [ avnik raskin bendlas ];
};
})
pkgs/misc/emulators/wine/staging.nix
+4 -4
View File
@@ -1,13 +1,13 @@
{ stdenv, callPackage, wineUnstable }:
{ lib, stdenv, callPackage, wineUnstable }:
with callPackage ./util.nix {};
let patch = (callPackage ./sources.nix {}).staging;
build-inputs = pkgNames: extra:
(mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert stdenv.lib.getVersion wineUnstable == patch.version;
in assert lib.getVersion wineUnstable == patch.version;
(stdenv.lib.overrideDerivation wineUnstable (self: {
(lib.overrideDerivation wineUnstable (self: {
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
name = "${self.name}-staging";
@@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version;
chmod +w patches
cd patches
patchShebangs gitapply.sh
./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
cd ..
'';
})) // {
pkgs/misc/emulators/wine/winetricks.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
{ lib, stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
, cabextract, unzip, p7zip, gnused, gnugrep, bash } :
stdenv.mkDerivation rec {
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
buildInputs = [ perl which ];
# coreutils is for sha1sum
pathAdd = stdenv.lib.concatMapStringsSep ":" (x: x + "/bin")
(stdenv.lib.filter (x: x != null)
pathAdd = lib.concatMapStringsSep ":" (x: x + "/bin")
(lib.filter (x: x != null)
[ wine perl which coreutils zenity curl cabextract unzip p7zip gnused gnugrep bash ]);
makeFlags = [ "PREFIX=$(out)" ];
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A script to install DLLs needed to work around problems in Wine";
license = stdenv.lib.licenses.lgpl21;
license = lib.licenses.lgpl21;
homepage = "https://github.com/Winetricks/winetricks";
platforms = with stdenv.lib.platforms; linux;
platforms = with lib.platforms; linux;
};
}
pkgs/misc/emulators/wxmupen64plus/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
, wafHook }:
stdenv.mkDerivation {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
meta = {
description = "GUI for the Mupen64Plus 2.0 emulator";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home";
};
}
pkgs/misc/emulators/xcpc/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext
{ lib, stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext
, libDSKSupport ? true, libdsk
, motifSupport ? false, lesstif
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
version = "20070122";
pname = "xcpc";
pkgs/misc/emulators/yuzu/default.nix
+3 -3
View File
@@ -20,15 +20,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ]
++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ];
++ lib.optionals useVulkan [ vulkan-loader vulkan-headers ];
cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ]
++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ];
++ lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ];
# Trick the configure system. This prevents a check for submodule directories.
preConfigure = "rm .gitmodules";
# Fix vulkan detection
postFixup = stdenv.lib.optionals useVulkan ''
postFixup = lib.optionals useVulkan ''
wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'';
pkgs/misc/emulators/zsnes/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL
{ lib, stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU, libGL
, makeDesktopItem }:
let
@@ -55,8 +55,8 @@ in stdenv.mkDerivation {
meta = {
description = "A Super Nintendo Entertainment System Emulator";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sander ];
homepage = "http://www.zsnes.com";
platforms = [ "i686-linux" "x86_64-linux" ];
};
pkgs/misc/ghostscript/default.nix
+4 -4
View File
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
cp -r Resource "$out/share/ghostscript/${version}"
ln -s "${fonts}" "$out/share/ghostscript/fonts"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString stdenv.isDarwin ''
for file in $out/lib/*.dylib* ; do
install_name_tool -id "$file" $file
done
@@ -132,9 +132,9 @@ stdenv.mkDerivation rec {
of output drivers for various file formats and printers.
'';
license = stdenv.lib.licenses.agpl3;
license = lib.licenses.agpl3;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.viric ];
};
}
pkgs/misc/gnash/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchpatch, autoreconfHook
{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook
, pkgconfig, libtool, boost, SDL
, glib, pango, gettext, curl, xorg
, libpng, libjpeg, giflib, speex, atk
@@ -24,7 +24,7 @@
, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null
}:
with stdenv.lib;
with lib;
let
available = x: x != null;
@@ -109,7 +109,7 @@ stdenv.mkDerivation {
})
];
configureFlags = with stdenv.lib; [
configureFlags = with lib; [
"--with-boost-incl=${boost.dev}/include"
"--with-boost-lib=${boost.out}/lib"
"--enable-renderer=${concatStringsSep "," renderers}"
pkgs/misc/jackaudio/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper
{ lib, stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt
, wafHook
# Darwin Dependencies
@@ -12,10 +12,10 @@
, prefix ? ""
}:
with stdenv.lib;
with lib;
let
inherit (python3Packages) python dbus-python;
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
libOnly = prefix == "lib";
pkgs/misc/jackaudio/jack1.nix
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
optAlsaLib = shouldUsePkg alsaLib;
optDb = shouldUsePkg db;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
configureFlags = [
(stdenv.lib.enableFeature (optLibffado != null) "firewire")
(lib.enableFeature (optLibffado != null) "firewire")
];
nativeBuildInputs = [ pkgconfig ];
pkgs/misc/libcardiacarrest/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }:
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, libpulseaudio }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "libcardiacarrest";
pkgs/misc/lilypond/with-fonts.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, lndir, symlinkJoin, makeWrapper
{ lib, stdenv, lndir, symlinkJoin, makeWrapper
, lilypond, openlilylib-fonts
}:
stdenv.lib.appendToName "with-fonts" (symlinkJoin {
lib.appendToName "with-fonts" (symlinkJoin {
inherit (lilypond) meta name version ;
paths = [ lilypond ] ++ openlilylib-fonts.all;
pkgs/misc/logging/beats/6.x.nix
+1 -1
View File
@@ -46,7 +46,7 @@ in {
journal entries from Linuxes with systemd.
'';
buildInputs = [ systemd.dev ];
postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
pkgs/misc/logging/beats/7.x.nix
+1 -1
View File
@@ -45,7 +45,7 @@ in {
journal entries from Linuxes with systemd.
'';
buildInputs = [ systemd.dev ];
postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
pkgs/misc/long-shebang/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }: let
{ lib, stdenv, fetchurl }: let
version = "1.2.0";
in stdenv.mkDerivation {
pname = "long-shebang";
@@ -14,8 +14,8 @@ in stdenv.mkDerivation {
homepage = "https://github.com/shlevy/long-shebang";
license = stdenv.lib.licenses.mit;
license = lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/misc/riscv-pk/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
revCount = "438";
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
configureScript = "../configure";
configureFlags = stdenv.lib.optional (payload != null)
configureFlags = lib.optional (payload != null)
"--with-payload=${payload}";
hardeningDisable = [ "all" ];
@@ -35,8 +35,8 @@ in stdenv.mkDerivation {
meta = {
description = "RISC-V Proxy Kernel and Bootloader";
homepage = "https://github.com/riscv/riscv-pk";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.riscv;
maintainers = [ stdenv.lib.maintainers.shlevy ];
license = lib.licenses.bsd3;
platforms = lib.platforms.riscv;
maintainers = [ lib.maintainers.shlevy ];
};
}
pkgs/misc/screensavers/betterlockscreen/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase =
let
PATH =
stdenv.lib.makeBinPath
lib.makeBinPath
[imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb];
in ''
mkdir -p $out/bin
pkgs/misc/screensavers/multilockscreen/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ let
i3lock = writeShellScriptBin "i3lock" ''
${i3lock-color}/bin/i3lock-color "$@"
'';
binPath = stdenv.lib.makeBinPath [
binPath = lib.makeBinPath [
imagemagick i3lock
xdpyinfo xrandr xset
bc feh procps xrdb
pkgs/misc/screensavers/pipes/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
make PREFIX=$out/ install
wrapProgram $out/bin/pipes.sh \
--set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}"
--set PATH "${lib.makeBinPath [ coreutils ncurses ]}"
'';
meta = with lib; {
pkgs/misc/screensavers/rss-glx/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}:
{lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}:
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
This package currently contains all of the screensavers from the
original collection, plus a few others.
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/misc/screensavers/slock/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, writeText
{ lib, stdenv, fetchurl, writeText
, xorgproto, libX11, libXext, libXrandr
# default header can be obtained from
# https://git.suckless.org/slock/tree/config.def.h
, conf ? null }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "slock-1.4";
pkgs/misc/screensavers/xscreensaver/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11
{ lib, stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2
, libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib
, forceInstallAllHacks ? false
@@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/xscreensaver-text \
--prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]}
--prefix PATH : ${lib.makeBinPath [xorg.appres]}
wrapProgram $out/bin/xscreensaver-getimage-file \
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [
EncodeLocale HTTPDate HTTPMessage IOSocketSSL LWP LWPProtocolHttps
MozillaCA NetHTTP NetSSLeay TryTiny URI
]}"
''
+ stdenv.lib.optionalString forceInstallAllHacks ''
+ lib.optionalString forceInstallAllHacks ''
make -C hacks/glx dnalogo
cat hacks/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks
cat hacks/glx/Makefile.in | grep -E '([a-z0-9]+):[[:space:]]*\1[.]o' | cut -d : -f 1 | xargs make -C hacks/glx
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.jwz.org/xscreensaver/";
description = "A set of screensavers";
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.unix; # Once had cygwin problems
inherit version;
downloadPage = "https://www.jwz.org/xscreensaver/download.html";
updateWalker = true;
pkgs/misc/screensavers/xssproxy/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }:
{ lib, stdenv, fetchFromGitHub, glib, pkgconfig, xorg, dbus }:
let rev = "1.0.0"; in
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
meta = {
description = "Forward freedesktop.org Idle Inhibition Service calls to Xss";
homepage = "https://github.com/timakro/xssproxy";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ benley ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ benley ];
platforms = lib.platforms.unix;
};
}
pkgs/misc/screensavers/xtrlock-pam/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }:
{ lib, stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }:
stdenv.mkDerivation {
name = "xtrlock-pam-3.4-post-20150909";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/aanatoly/xtrlock-pam";
description = "PAM based X11 screen locker";
license = "unknown";
maintainers = with stdenv.lib.maintainers; [ tstrobel ];
platforms = with stdenv.lib.platforms; linux;
maintainers = with lib.maintainers; [ tstrobel ];
platforms = with lib.platforms; linux;
};
}
pkgs/misc/sndio/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
pname = "sndio";
version = "1.7.0";
enableParallelBuilding = true;
nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isLinux alsaLib;
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
src = fetchurl {
url = "http://www.sndio.org/sndio-${version}.tar.gz";
pkgs/misc/stabber/default.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
, libmicrohttpd
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation {
pname = "stabber-unstable";
pkgs/misc/talkfilters/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
let
pname = "talkfilters";
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
meta = {
description = "Converts English text into text that mimics a stereotyped or humorous dialect";
homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
platforms = with stdenv.lib.platforms; unix;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ ikervagyok ];
platforms = with lib.platforms; unix;
};
}
pkgs/misc/tmux-plugins/default.nix
+9 -9
View File
@@ -88,9 +88,9 @@ in rec {
computer or server restarts, if the machine is on, tmux will be there how
you left it off the last time it was used.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ronanmacf ];
};
};
@@ -379,9 +379,9 @@ in rec {
* restoring vim and neovim sessions
* restoring pane contents
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ ronanmacf ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ronanmacf ];
};
};
@@ -491,9 +491,9 @@ in rec {
* User menu.
* Popup window support.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ kyleondy ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ kyleondy ];
};
};
pkgs/misc/vim-plugins/build-vim-plugin.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, rtpPath ? "share/vim-plugins"
, vim
}:
@@ -18,7 +18,7 @@ rec {
buildPhase ? "",
preInstall ? "",
postInstall ? "",
path ? stdenv.lib.getName name,
path ? lib.getName name,
addonInfo ? null,
...
}:
pkgs/misc/vim-plugins/overrides.nix
+13 -13
View File
@@ -73,11 +73,11 @@ self: super: {
src = LanguageClient-neovim-src;
cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
preConfigure = lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
'';
};
@@ -180,8 +180,8 @@ self: super: {
meta = {
description = "Address-completion for khard via deoplete";
homepage = "https://github.com/nicoe/deoplete-khard";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ jorsn ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jorsn ];
};
});
@@ -234,7 +234,7 @@ self: super: {
meta = with lib; {
description = "Discord rich presence for Vim";
homepage = "https://github.com/hugolgst/vimsence";
maintainers = with stdenv.lib.maintainers; [ hugolgst ];
maintainers = with lib.maintainers; [ hugolgst ];
};
});
@@ -245,7 +245,7 @@ self: super: {
meson = buildVimPluginFrom2Nix {
inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim";
meta.maintainers = with stdenv.lib.maintainers; [ vcunat ];
meta.maintainers = with lib.maintainers; [ vcunat ];
};
ncm2 = super.ncm2.overrideAttrs(old: {
@@ -325,7 +325,7 @@ self: super: {
description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
homepage = "http://algorithm.com.au/code/vimacs";
license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ millerjason ];
maintainers = with lib.maintainers; [ millerjason ];
};
});
@@ -334,7 +334,7 @@ self: super: {
});
vim-addon-manager = super.vim-addon-manager.overrideAttrs(old: {
buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
buildInputs = lib.optional stdenv.isDarwin Cocoa;
});
vim-addon-actions = super.vim-addon-actions.overrideAttrs(old: {
@@ -581,7 +581,7 @@ self: super: {
buildInputs = [ python3.pkgs.jedi ];
meta = {
description = "code-completion for python using python-jedi";
license = stdenv.lib.licenses.mit;
license = lib.licenses.mit;
};
});
@@ -602,7 +602,7 @@ self: super: {
propagatedBuildInputs = [ gnome3.zenity ];
meta = {
description = "Simple color selector/picker plugin";
license = stdenv.lib.licenses.publicDomain;
license = lib.licenses.publicDomain;
};
});
@@ -632,7 +632,7 @@ self: super: {
ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase
'';
meta.platforms = stdenv.lib.platforms.all;
meta.platforms = lib.platforms.all;
});
vim-clap = super.vim-clap.overrideAttrs(old: {
@@ -647,7 +647,7 @@ self: super: {
buildInputs = [
openssl
] ++ stdenv.lib.optionals stdenv.isDarwin [
] ++ lib.optionals stdenv.isDarwin [
CoreServices
curl
libgit2
@@ -660,7 +660,7 @@ self: super: {
ln -s ${maple-bin}/bin/maple $target/bin/maple
'';
meta.platforms = stdenv.lib.platforms.all;
meta.platforms = lib.platforms.all;
});
completion-tabnine = super.completion-tabnine.overrideAttrs(old: {
pkgs/misc/vim-plugins/vim-utils.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin
{ lib, stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin
, nix-prefetch-hg, nix-prefetch-git
, fetchFromGitHub, runtimeShell
}:
@@ -150,7 +150,7 @@ vim_with_plugins can be installed like any other application within Nix.
let
inherit (stdenv) lib;
inherit lib;
# make sure a plugin is a derivation and its dependencies are derivations. If
# plugin already is a derivation, this is a no-op. If it is a string, it is
@@ -373,7 +373,7 @@ rec {
gvimExecutableName,
}:
let
rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}";
rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}";
vimWrapperScript = writeScriptBin vimExecutableName ''
#!${runtimeShell}
exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"
@@ -450,7 +450,7 @@ rec {
vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; };
inherit (import ./build-vim-plugin.nix { inherit stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix;
# used to figure out which python dependencies etc. neovim needs
requiredPlugins = {

Some files were not shown because too many files have changed in this diff Show More