steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

adjust to nixos 21.05

Browse source
This commit is contained in:
steveej 2021-06-08 12:39:01 +02:00
parent 454aa6e386
commit 1242a8e215
14 changed files with 145 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/pkgs/default.nix
View file

@ -86,7 +86,8 @@ in rec {
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; };
myPython = pkgs.python37Full.withPackages (ps: with ps; [
pythonPackages = pkgs.python38Packages;
myPython = pkgs.python38Full.withPackages (ps: with ps; [
pep8 yapf flake8
# autopep8 (broken)
# pylint (broken)

12
nix/pkgs/mfcl3770cdw.nix
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 ];
};
};
}