From 46a2da876637f2be699557571605c47bc9d2b62f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 24 May 2017 02:08:06 +0300 Subject: wine: use gstreamer-1.0 --- pkgs/misc/emulators/wine/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/misc/emulators') diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 3bb6ec3e7bb9..80070dec2d91 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional alsaSupport pkgs.alsaLib ++ 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 gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] @@ -93,7 +93,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { '' + lib.optionalString supportFlags.gstreamerSupport '' wrapProgram "$out/bin/wine" \ --argv0 "" \ - --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; enableParallelBuilding = true; -- cgit 1.4.1