swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues 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
parent 874b017564 79192b2d05
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
, 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"