public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #11927: wine: add pulseaudio support

Browse Source
This commit is contained in:
Vladimír Čunát 2016-01-05 09:25:46 +01:00
commit eeb3119604
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/misc/emulators/wine/base.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, pkgArches, { stdenv, lib, pkgArches,
name, version, src, monos, geckos, platforms, name, version, src, monos, geckos, platforms,
pulseaudioSupport,
buildScript ? null, configureFlags ? "" buildScript ? null, configureFlags ? ""
}: }:
@ -19,7 +20,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses 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 xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
])); ]));

2
pkgs/misc/emulators/wine/default.nix
View File

@ -9,11 +9,13 @@
{ lib, pkgs, system, callPackage, { lib, pkgs, system, callPackage,
wineRelease ? "stable", wineRelease ? "stable",
wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"), wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
pulseaudioSupport ? false,
libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }: libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
let wine-build = build: release: let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix { lib.getAttr build (callPackage ./packages.nix {
wineRelease = release; wineRelease = release;
inherit pulseaudioSupport;
}); });
in if wineRelease == "staging" then in if wineRelease == "staging" then

4
pkgs/misc/emulators/wine/packages.nix
View File

@ -1,4 +1,5 @@
{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl, { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
pulseaudioSupport,
wineRelease ? "stable" wineRelease ? "stable"
}: }:
@ -30,6 +31,7 @@ in {
name = "wine-${version}"; name = "wine-${version}";
inherit (sources) version src; inherit (sources) version src;
inherit (pkgsi686Linux) lib stdenv; inherit (pkgsi686Linux) lib stdenv;
inherit pulseaudioSupport;
pkgArches = [ pkgsi686Linux ]; pkgArches = [ pkgsi686Linux ];
geckos = with sources; [ wineGecko32 ]; geckos = with sources; [ wineGecko32 ];
monos = with sources; [ wineMono ]; monos = with sources; [ wineMono ];
@ -39,6 +41,7 @@ in {
name = "wine64-${version}"; name = "wine64-${version}";
inherit (sources) version src; inherit (sources) version src;
inherit lib stdenv; inherit lib stdenv;
inherit pulseaudioSupport;
pkgArches = [ pkgs ]; pkgArches = [ pkgs ];
geckos = with sources; [ wineGecko64 ]; geckos = with sources; [ wineGecko64 ];
monos = with sources; [ wineMono ]; monos = with sources; [ wineMono ];
@ -50,6 +53,7 @@ in {
inherit (sources) version src; inherit (sources) version src;
inherit lib; inherit lib;
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit pulseaudioSupport;
pkgArches = [ pkgs pkgsi686Linux ]; pkgArches = [ pkgs pkgsi686Linux ];
geckos = with sources; [ wineGecko32 wineGecko64 ]; geckos = with sources; [ wineGecko32 wineGecko64 ];
monos = with sources; [ wineMono ]; monos = with sources; [ wineMono ];

2
pkgs/misc/emulators/wine/staging.nix
View File

@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
in assert (builtins.parseDrvName wineUnstable.name).version == version; in assert (builtins.parseDrvName wineUnstable.name).version == version;
stdenv.lib.overrideDerivation wineUnstable (self: { stdenv.lib.overrideDerivation wineUnstable (self: {
nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs;
buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
name = "${self.name}-staging"; name = "${self.name}-staging";

1
pkgs/top-level/all-packages.nix
View File

@ -15742,6 +15742,7 @@ let
wine = callPackage ../misc/emulators/wine { wine = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable"; wineRelease = config.wine.release or "stable";
wineBuild = config.wine.build or "wine32"; wineBuild = config.wine.build or "wine32";
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
}; };
wineStable = wine.override { wineRelease = "stable"; }; wineStable = wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; }); wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });