From 79192b2d05b167798448b4c2aa85523923fa4b23 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 16 Nov 2018 23:50:38 +0100 Subject: [PATCH] gnash: remove gstreamer support --- pkgs/misc/gnash/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 8aeabebbefea..db2afa5ba631 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -15,9 +15,6 @@ # media , enableFFmpeg ? true, ffmpeg_2 ? null -, enableGstreamer ? false, gst-plugins-base ? null - , gst-plugins-ugly ? null - , gst-ffmpeg ? null # misc , enableJemalloc ? true, jemalloc ? null @@ -31,8 +28,7 @@ let available = x: x != null; sound = - if enableFFmpeg then "ffmpeg" else - if enableGstreamer then "gst" else "none"; + if enableFFmpeg then "ffmpeg" else "none"; renderers = [] ++ optional enableAGG "agg" @@ -58,7 +54,6 @@ assert enableQt -> available qt4; # media libraries assert enableFFmpeg -> available ffmpeg_2 ; -assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; # misc assert enableJemalloc -> available jemalloc; @@ -96,8 +91,7 @@ stdenv.mkDerivation rec { ++ optional enableJemalloc jemalloc ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ] - ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; + ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; configureFlags = with stdenv.lib; [ "--with-boost-incl=${boost.dev}/include"