git.iko.soy/typeable/nixpkgs
on master help sign in
xorg: mark fonts with proprietary licences as unfree
commitc45160366b824a2d7a70c14b9ef1f797718fdd45 authorrnhmjoj <rnhmjoj@inventati.org> dateSun 30 Aug 2020, 15:33 (6 years ago) parent8cadf94
1 file changed+38−4
pkgs/servers/x11/xorg/overrides.nix+38−4
pkgs/servers/x11/xorg/overrides.nix+38−4
@@ -50,10 +50,6 @@ self: super:
5050 hardeningDisable = [ "format" ];
5151 });
5252
53− fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
54− meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
55− });
56−
5753 fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
5854 postInstall =
5955 ''
@@ -870,3 +866,41 @@ self: super:
870866 });
871867
872868}
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+)