From 66fffe99d85f7d1f7d7a7f655b35bf8b13f93811 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 12 Jun 2019 23:33:13 +0200
Subject: [PATCH 1/2] winePackages.fonts: init at 4.0

"Wine's fonts should be a natural candidate for their own subpackage"
https://wiki.winehq.org/Packaging

They are a replacement for some Microsoft fonts not available in other
replacement packages.
---
 pkgs/misc/emulators/wine/fonts.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 pkgs/top-level/wine-packages.nix   |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/emulators/wine/fonts.nix

diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/misc/emulators/wine/fonts.nix
new file mode 100644
index 00000000000..0ee1b3973d8
--- /dev/null
+++ b/pkgs/misc/emulators/wine/fonts.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, callPackage }:
+let src = (callPackage ./sources.nix {}).stable;
+in
+stdenv.mkDerivation {
+  pname = "wine-fonts";
+  inherit (src) version;
+
+  sourceRoot = "wine-${src.version}/fonts";
+  inherit src;
+
+  installPhase = ''
+    install *.ttf -Dt $out/share/fonts/wine
+  '';
+
+  meta = {
+    description = "Microsoft replacement fonts by the Wine project";
+    homepage = "https://wiki.winehq.org/Create_Fonts";
+    license = with lib.licenses; [ lgpl21Plus ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ avnik raskin bendlas johnazoidberg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30163fe7ec7..c5420809e6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23918,7 +23918,7 @@ in
     inherit wineBuild;
 
     inherit (callPackage ./wine-packages.nix {})
-      minimal base full stable unstable staging;
+      minimal base full stable unstable staging fonts;
   });
 
   winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
index 3a81a3d99bc..2c47a362c9a 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -1,6 +1,7 @@
 { stdenv, config, callPackage, wineBuild }:
 
 rec {
+  fonts = callPackage ../misc/emulators/wine/fonts.nix {};
   minimal = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
     inherit wineBuild;

From 3303bc1fd70f75226dadf2113a1f038aca14dc77 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Wed, 12 Jun 2019 23:36:10 +0200
Subject: [PATCH 2/2] wine: Use proper license attribute

---
 pkgs/misc/emulators/wine/base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 4c3a2b2d588..6e11eaaa5b5 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -114,8 +114,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;
-    homepage = http://www.winehq.org/;
-    license = "LGPL";
+    homepage = "https://www.winehq.org/";
+    license = with stdenv.lib.licenses; [ lgpl21Plus ];
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
     maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ];
   };