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

Merge pull request #50481 from rnhmjoj/gnash

Browse Source 
gnash: remove gstreamer support
This commit is contained in:
Jörg Thalheim 2018-11-16 23:40:42 +00:00 committed by GitHub
commit 43c8b6309f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/gnash/default.nix
View File

@ -15,9 +15,6 @@
# media # media
, enableFFmpeg ? true, ffmpeg_2 ? null , enableFFmpeg ? true, ffmpeg_2 ? null
, enableGstreamer ? false, gst-plugins-base ? null
, gst-plugins-ugly ? null
, gst-ffmpeg ? null
# misc # misc
, enableJemalloc ? true, jemalloc ? null , enableJemalloc ? true, jemalloc ? null
@ -31,8 +28,7 @@ let
available = x: x != null; available = x: x != null;
sound = sound =
if enableFFmpeg then "ffmpeg" else if enableFFmpeg then "ffmpeg" else "none";
if enableGstreamer then "gst" else "none";
renderers = [] renderers = []
++ optional enableAGG "agg" ++ optional enableAGG "agg"
@ -58,7 +54,6 @@ assert enableQt -> available qt4;
# media libraries # media libraries
assert enableFFmpeg -> available ffmpeg_2 ; assert enableFFmpeg -> available ffmpeg_2 ;
assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
# misc # misc
assert enableJemalloc -> available jemalloc; assert enableJemalloc -> available jemalloc;
@ -96,8 +91,7 @@ stdenv.mkDerivation rec {
++ optional enableJemalloc jemalloc ++ optional enableJemalloc jemalloc
++ optional enableHwAccel libGLU_combined ++ optional enableHwAccel libGLU_combined
++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enablePlugins [ xulrunner npapi_sdk ]
++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ] ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ];
++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
configureFlags = with stdenv.lib; [ configureFlags = with stdenv.lib; [
"--with-boost-incl=${boost.dev}/include" "--with-boost-incl=${boost.dev}/include"