Merge pull request #63044 from JohnAZoidberg/wine-fonts

winePackages.fonts: init at 4.0
This commit is contained in:
Michael Raskin 2019-06-17 19:39:52 +00:00 committed by GitHub
commit 63379e8e86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions

View file

@ -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 ];
};

View file

@ -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 ];
};
}

View file

@ -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"));

View file

@ -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;