From 95f321480fe5aa1a3c1b13f4a593ee91a95de800 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 24 May 2017 02:07:23 +0300 Subject: [PATCH] wine: add udev support --- pkgs/misc/emulators/wine/base.nix | 1 + pkgs/misc/emulators/wine/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 19026274d56..13c2dc6da4d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ 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.optional udevSupport pkgs.udev ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index deeff3c7343..91fb0da82d8 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -38,6 +38,7 @@ gphoto2Support ? false, ldapSupport ? false, pulseaudioSupport ? false, + udevSupport ? false, xineramaSupport ? false, xmlSupport ? false }: @@ -50,7 +51,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport; + openglSupport gstreamerSupport udevSupport; }; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b52fa6f67..07643fa6151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18666,6 +18666,7 @@ with pkgs; gphoto2Support = true; ldapSupport = true; pulseaudioSupport = true; + udevSupport = true; }); wineStable = self.wine.override { wineRelease = "stable"; }; wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });