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

wine: add udev support

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-05-24 02:07:23 +03:00
parent 118cbadb31
commit 95f321480f
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
++ lib.optional udevSupport pkgs.udev
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]

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

@ -38,6 +38,7 @@
gphoto2Support ? false, gphoto2Support ? false,
ldapSupport ? false, ldapSupport ? false,
pulseaudioSupport ? false, pulseaudioSupport ? false,
udevSupport ? false,
xineramaSupport ? false, xineramaSupport ? false,
xmlSupport ? false }: xmlSupport ? false }:
@ -50,7 +51,7 @@ 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; openglSupport gstreamerSupport udevSupport;
}; };
}); });

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

@ -18666,6 +18666,7 @@ with pkgs;
gphoto2Support = true; gphoto2Support = true;
ldapSupport = true; ldapSupport = true;
pulseaudioSupport = true; pulseaudioSupport = true;
udevSupport = true;
}); });
wineStable = self.wine.override { wineRelease = "stable"; }; wineStable = self.wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; }); wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });