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

pantheon, aliases: remove remaining gst-ffmpeg

Browse Source 
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:
Vladimír Čunát 2019-02-01 09:43:57 +01:00
parent 8ba516664b
commit f55f45f273
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/pantheon/apps/elementary-videos/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3
, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 , 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 { stdenv.mkDerivation rec {
pname = "videos"; pname = "videos";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
clutter-gtk clutter-gtk
elementary-icon-theme elementary-icon-theme
granite granite
gst-ffmpeg #gst-ffmpeg #FIXME?
gst-libav gst-libav
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base

2
pkgs/top-level/aliases.nix
View File

@ -388,12 +388,10 @@ mapAliases ({
gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsBad = pkgs.gst-plugins-bad;
gstPluginsGood = pkgs.gst-plugins-good; gstPluginsGood = pkgs.gst-plugins-good;
gstPluginsUgly = pkgs.gst-plugins-ugly; gstPluginsUgly = pkgs.gst-plugins-ugly;
gstFfmpeg = pkgs.gst-ffmpeg;
gst-plugins-base = pkgs.gst-plugins-base; gst-plugins-base = pkgs.gst-plugins-base;
gst-plugins-bad = pkgs.gst-plugins-bad; gst-plugins-bad = pkgs.gst-plugins-bad;
gst-plugins-good = pkgs.gst-plugins-good; gst-plugins-good = pkgs.gst-plugins-good;
gst-plugins-ugly = pkgs.gst-plugins-ugly; gst-plugins-ugly = pkgs.gst-plugins-ugly;
gst-ffmpeg = pkgs.gst-ffmpeg;
}; };
} // (with ocaml-ng; { # added 2016-09-14 } // (with ocaml-ng; { # added 2016-09-14
ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;