pantheon, aliases: remove remaining gst-ffmpeg
This fixes evaluation. I'm not sure why pantheon.elementary-videos was mixing gst 1 with old gst-ffmpeg. /cc #48637, #50220.
This commit is contained in:
parent
8ba516664b
commit
f55f45f273
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
|
||||
, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1
|
||||
, gobject-introspection, elementary-icon-theme, wrapGAppsHook, gst-ffmpeg }:
|
||||
, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "videos";
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
clutter-gtk
|
||||
elementary-icon-theme
|
||||
granite
|
||||
gst-ffmpeg
|
||||
#gst-ffmpeg #FIXME?
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
|
@ -388,12 +388,10 @@ mapAliases ({
|
||||
gstPluginsBad = pkgs.gst-plugins-bad;
|
||||
gstPluginsGood = pkgs.gst-plugins-good;
|
||||
gstPluginsUgly = pkgs.gst-plugins-ugly;
|
||||
gstFfmpeg = pkgs.gst-ffmpeg;
|
||||
gst-plugins-base = pkgs.gst-plugins-base;
|
||||
gst-plugins-bad = pkgs.gst-plugins-bad;
|
||||
gst-plugins-good = pkgs.gst-plugins-good;
|
||||
gst-plugins-ugly = pkgs.gst-plugins-ugly;
|
||||
gst-ffmpeg = pkgs.gst-ffmpeg;
|
||||
};
|
||||
} // (with ocaml-ng; { # added 2016-09-14
|
||||
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
|
||||
|
Loading…
x
Reference in New Issue
Block a user