diff options
author | Lengyel Balázs <ikervagyok@gmail.com> | 2015-12-24 02:58:57 +0100 |
---|---|---|
committer | Lengyel Balázs <ikervagyok@gmail.com> | 2015-12-25 00:40:26 +0100 |
commit | 0ca96aa43c2d8c36ce6515a4ff407bc4417496fb (patch) | |
tree | 08b559ec80ac1d569ec46c94c50cc70739b27d0d /pkgs/misc | |
parent | 1d132f38a65f197eaa6454b3514fa874fe247f79 (diff) |
wine: add initial pulseaudio support
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/wine/base.nix | 5 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/packages.nix | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 1e2d656fb0ef0..e031627a032d7 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,5 +1,6 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, + pulseaudioSupport, buildScript ? null, configureFlags ? "" }: @@ -19,7 +20,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses - ]) ++ (with pkgs.xorg; [ + ]) + ++ lib.optional pulseaudioSupport pkgs.libpulseaudio + ++ (with pkgs.xorg; [ xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite ])); diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 5261f79de1074..a402fba69f676 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,11 +9,13 @@ { lib, pkgs, system, callPackage, wineRelease ? "stable", wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), + pulseaudioSupport ? false, libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { wineRelease = release; + inherit pulseaudioSupport; }); in if wineRelease == "staging" then diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix index ce983b993144b..1a7e32efcbe18 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/misc/emulators/wine/packages.nix @@ -1,4 +1,5 @@ { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl, + pulseaudioSupport, wineRelease ? "stable" }: @@ -30,6 +31,7 @@ in { name = "wine-${version}"; inherit (sources) version src; inherit (pkgsi686Linux) lib stdenv; + inherit pulseaudioSupport; pkgArches = [ pkgsi686Linux ]; geckos = with sources; [ wineGecko32 ]; monos = with sources; [ wineMono ]; @@ -39,6 +41,7 @@ in { name = "wine64-${version}"; inherit (sources) version src; inherit lib stdenv; + inherit pulseaudioSupport; pkgArches = [ pkgs ]; geckos = with sources; [ wineGecko64 ]; monos = with sources; [ wineMono ]; @@ -50,6 +53,7 @@ in { inherit (sources) version src; inherit lib; stdenv = stdenv_32bit; + inherit pulseaudioSupport; pkgArches = [ pkgs pkgsi686Linux ]; geckos = with sources; [ wineGecko32 wineGecko64 ]; monos = with sources; [ wineMono ]; |