diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-06-17 19:39:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-17 19:39:52 +0000 |
commit | 63379e8e86f055750a8ba228480f0fe1e2c8b51b (patch) | |
tree | 2cc55c3eb13836a5aa683327c1ff97be73a53421 /pkgs | |
parent | 994a2319a17a5ef8d0f05f3171814df405b2ec60 (diff) | |
parent | 3303bc1fd70f75226dadf2113a1f038aca14dc77 (diff) |
Merge pull request #63044 from JohnAZoidberg/wine-fonts
winePackages.fonts: init at 4.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/fonts.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/wine-packages.nix | 1 |
4 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 4c3a2b2d588ff..6e11eaaa5b575 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 0000000000000..0ee1b3973d86c --- /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 fecf53c3f4d6e..9b81ca38714d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23935,7 +23935,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 3a81a3d99bce6..2c47a362c9a14 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; |