diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index a07667cd625..dc25c6b377d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4442453644c..43103586b1c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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;