diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/misc/emulators | |
parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators')
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/ccemux/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/citra/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/wine/base.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/wine/fonts.nix | 22 |
4 files changed, 26 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index 77d9f5094d05..f3ec6421339f 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, makeWrapper, jre +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, jre , useCCTweaked ? true }: diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index b0d422385424..3e8f78c44115 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }: +{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: stdenv.mkDerivation rec { name = "citra-${version}"; diff --git a/nixpkgs/pkgs/misc/emulators/wine/base.nix b/nixpkgs/pkgs/misc/emulators/wine/base.nix index 4c3a2b2d588f..6e11eaaa5b57 100644 --- a/nixpkgs/pkgs/misc/emulators/wine/base.nix +++ b/nixpkgs/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/nixpkgs/pkgs/misc/emulators/wine/fonts.nix b/nixpkgs/pkgs/misc/emulators/wine/fonts.nix new file mode 100644 index 000000000000..0ee1b3973d86 --- /dev/null +++ b/nixpkgs/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 ]; + }; +} |