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

Re-Revert "xorg: mark fonts with proprietary licences as unfree"

Browse Source 
This reverts commit 5d993eeb84.
The revert didn't seem to fix the problem (#99236) and the errors look
the same (tried several times).
This commit is contained in:
Vladimír Čunát 2020-10-04 20:26:33 +02:00
parent 9243c64e7f
commit 0e0885d3da
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/servers/x11/xorg/overrides.nix
View File

@ -50,10 +50,6 @@ self: super:
hardeningDisable = [ "format" ];
});
fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
});
fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
postInstall =
''
@ -870,3 +866,41 @@ self: super:
});
}
# mark some packages as unfree
// (
let
# unfree but redistributable
redist = [
"fontadobeutopiatype1"
"fontadobeutopia100dpi"
"fontadobeutopia75dpi"
"fontbhtype1"
"fontibmtype1"
"fontbhttf"
"fontbh100dpi"
"fontbh75dpi"
];
# unfree, possibly not redistributable
unfree = [
# no license, just a copyright notice
"fontbhlucidatypewriter100dpi"
"fontbhlucidatypewriter75dpi"
"fontdaewoomisc"
# unclear license, "permission to use"?
"fontjismisc"
];
setLicense = license: name:
super.${name}.overrideAttrs (attrs: {
meta = attrs.meta // { inherit license; };
});
mapNamesToAttrs = f: names: with lib;
listToAttrs (zipListsWith nameValuePair names (map f names));
in
mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist //
mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
)