@@ -50,6 +50,10 @@ self: super:
5050 hardeningDisable = [ "format" ];
5151 });
5252
53+ fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
54+ meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
55+ });
56+
5357 fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
5458 postInstall =
5559 ''
@@ -866,41 +870,3 @@ self: super:
866870 });
867871
868872}
869−
870−# mark some packages as unfree
871−// (
872− let
873− # unfree but redistributable
874− redist = [
875− "fontadobeutopiatype1"
876− "fontadobeutopia100dpi"
877− "fontadobeutopia75dpi"
878− "fontbhtype1"
879− "fontibmtype1"
880− "fontbhttf"
881− "fontbh100dpi"
882− "fontbh75dpi"
883− ];
884−
885− # unfree, possibly not redistributable
886− unfree = [
887− # no license, just a copyright notice
888− "fontbhlucidatypewriter100dpi"
889− "fontbhlucidatypewriter75dpi"
890− "fontdaewoomisc"
891−
892− # unclear license, "permission to use"?
893− "fontjismisc"
894− ];
895−
896− setLicense = license: name:
897− super.${name}.overrideAttrs (attrs: {
898− meta = attrs.meta // { inherit license; };
899− });
900− mapNamesToAttrs = f: names: with lib;
901− listToAttrs (zipListsWith nameValuePair names (map f names));
902−
903− in
904− mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist //
905− mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
906−)