Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 874b0175642d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43c8b6309fe1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2018

  1. gnash: remove gstreamer support

    @rnhmjoj
    rnhmjoj committed Nov 16, 2018
    Copy the full SHA
    79192b2 View commit details

  2. Merge pull request #50481 from rnhmjoj/gnash 

    gnash: remove gstreamer support
    @Mic92
    Mic92 authored Nov 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43c8b63 View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/misc/gnash/default.nix
10 changes: 2 additions & 8 deletions pkgs/misc/gnash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"