From 5d993eeb849fe4b90f8723291a4987b5d5a96173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 4 Oct 2020 18:44:36 +0200
Subject: [PATCH] Revert "xorg: mark fonts with proprietary licences as unfree"

This reverts commit c45160366b824a2d7a70c14b9ef1f797718fdd45
and hopefully fixes #99236: evaluation on Hydra.

For lack of a better method, I used the live jobset to bisect.
On the reverted commit it failed (tried several times because sometimes
evaluation fail transiently, possibly due to exhausting some resources)
and on the parent it succeeded: https://hydra.nixos.org/eval/1617490

Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
---
 pkgs/servers/x11/xorg/overrides.nix | 42 +++--------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 80112755e6df..a822ad989acb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -50,6 +50,10 @@ self: super:
     hardeningDisable = [ "format" ];
   });
 
+  fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
+    meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
+  });
+
   fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
     postInstall =
       ''
@@ -866,41 +870,3 @@ 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
-)