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

mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2

Browse Source 
effectively updates them to depend on ffmpeg_3_3
This commit is contained in:
Cray Elliott 2017-04-24 14:47:46 -07:00
parent fe3590b5ba
commit c49a454210
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/video/mpv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper { stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2 , docutils, perl, pkgconfig, python3, which, ffmpeg
, freefont_ttf, freetype, libass, libpthreadstubs , freefont_ttf, freetype, libass, libpthreadstubs
, lua, lua5_sockets, libuchardet, libiconv ? null, darwin , lua, lua5_sockets, libuchardet, libiconv ? null, darwin
@ -112,7 +112,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ];
buildInputs = [ buildInputs = [
ffmpeg_3_2 freetype libass libpthreadstubs ffmpeg freetype libass libpthreadstubs
lua lua5_sockets libuchardet lua lua5_sockets libuchardet
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
libiconv Cocoa CoreAudio ]) libiconv Cocoa CoreAudio ])

2
pkgs/tools/X11/xpra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, python2Packages, pkgconfig { stdenv, lib, fetchurl, python2Packages, pkgconfig
, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
, ffmpeg_3_2, x264, libvpx, libwebp , ffmpeg, x264, libvpx, libwebp
, libfakeXinerama , libfakeXinerama
, gst_all_1, pulseaudioLight, gobjectIntrospection , gst_all_1, pulseaudioLight, gobjectIntrospection
, pam }: , pam }: