Merge staging-next into staging

2 files changed, 24 insertions, 2 deletions

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 3ac3c92de6f3..e86db53c88a6 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 ];
   };
diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/misc/emulators/wine/fonts.nix
new file mode 100644
index 000000000000..0ee1b3973d86
--- /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 ];
+  };
+}