faudio, wine, vkd3d: add faudio 19.10 and vkd3d 1.1 to wine
fixes https://github.com/NixOS/nixpkgs/pull/68952
This commit is contained in:
parent
39b7c7e688
commit
2718c41712
27
pkgs/development/libraries/faudio/default.nix
Normal file
27
pkgs/development/libraries/faudio/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, cmake, SDL2}:
|
||||||
|
|
||||||
|
#TODO: tests
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "faudio";
|
||||||
|
version = "19.10";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "FNA-XNA";
|
||||||
|
repo = "FAudio";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1z7j803nxhgvjwpxr1m5d490yji727v7pn0ghhipbrfxlwzkw1sz";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [cmake];
|
||||||
|
|
||||||
|
buildInputs = [ SDL2 ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library";
|
||||||
|
homepage = "https://github.com/FNA-XNA/FAudio";
|
||||||
|
license = licenses.zlib;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.marius851000 ];
|
||||||
|
};
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, pkgArches,
|
{ stdenv, lib, pkgArches, callPackage,
|
||||||
name, version, src, monos, geckos, platforms,
|
name, version, src, monos, geckos, platforms,
|
||||||
pkgconfig, fontforge, makeWrapper, flex, bison,
|
pkgconfig, fontforge, makeWrapper, flex, bison,
|
||||||
supportFlags,
|
supportFlags,
|
||||||
@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
with import ./util.nix { inherit lib; };
|
with import ./util.nix { inherit lib; };
|
||||||
|
|
||||||
|
let
|
||||||
|
vkd3d = callPackage ./vkd3d.nix {};
|
||||||
|
in
|
||||||
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||||
builder = buildScript;
|
builder = buildScript;
|
||||||
}) // rec {
|
}) // rec {
|
||||||
@ -46,6 +49,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
|||||||
++ lib.optional udevSupport pkgs.udev
|
++ lib.optional udevSupport pkgs.udev
|
||||||
++ lib.optional vulkanSupport pkgs.vulkan-loader
|
++ lib.optional vulkanSupport pkgs.vulkan-loader
|
||||||
++ lib.optional sdlSupport pkgs.SDL2
|
++ lib.optional sdlSupport pkgs.SDL2
|
||||||
|
++ lib.optional faudioSupport pkgs.faudio
|
||||||
|
++ lib.optional vkd3dSupport vkd3d
|
||||||
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
|
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
|
||||||
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
|
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
|
||||||
(gst-plugins-bad.override { enableZbar = false; }) ])
|
(gst-plugins-bad.override { enableZbar = false; }) ])
|
||||||
|
@ -43,6 +43,8 @@
|
|||||||
xmlSupport ? false,
|
xmlSupport ? false,
|
||||||
vulkanSupport ? false,
|
vulkanSupport ? false,
|
||||||
sdlSupport ? false,
|
sdlSupport ? false,
|
||||||
|
faudioSupport ? false,
|
||||||
|
vkd3dSupport ? false,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let wine-build = build: release:
|
let wine-build = build: release:
|
||||||
@ -54,7 +56,8 @@ let wine-build = build: release:
|
|||||||
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
|
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
|
||||||
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
|
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
|
||||||
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
|
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
|
||||||
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport;
|
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
|
||||||
|
vkd3dSupport;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
26
pkgs/misc/emulators/wine/vkd3d.nix
Normal file
26
pkgs/misc/emulators/wine/vkd3d.nix
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{ stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }:
|
||||||
|
|
||||||
|
#TODO: MoltenVK
|
||||||
|
#TODO: unstable
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "vkd3d";
|
||||||
|
version = "1.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz";
|
||||||
|
sha256 = "1dkayp95g1691w7n2yn1q9y7klq5xa921dgmn9a5vil0rihxqnj9";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ vulkan-headers spirv-headers vulkan-loader ];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "A 3d library build on top on Vulkan with a similar api to DirectX 12";
|
||||||
|
homepage = "https://source.winehq.org/git/vkd3d.git";
|
||||||
|
license = licenses.lgpl21;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.marius851000 ];
|
||||||
|
};
|
||||||
|
}
|
@ -1629,6 +1629,8 @@ in
|
|||||||
|
|
||||||
fast-cli = nodePackages.fast-cli;
|
fast-cli = nodePackages.fast-cli;
|
||||||
|
|
||||||
|
faudio = callPackage ../development/libraries/faudio { };
|
||||||
|
|
||||||
fd = callPackage ../tools/misc/fd { };
|
fd = callPackage ../tools/misc/fd { };
|
||||||
|
|
||||||
fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
|
fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
|
||||||
|
@ -44,6 +44,8 @@ rec {
|
|||||||
gsmSupport = true;
|
gsmSupport = true;
|
||||||
gphoto2Support = true;
|
gphoto2Support = true;
|
||||||
ldapSupport = true;
|
ldapSupport = true;
|
||||||
|
faudioSupport = true;
|
||||||
|
vkd3dSupport = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
stable = base.override { wineRelease = "stable"; };
|
stable = base.override { wineRelease = "stable"; };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user