diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-04-24 14:47:46 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-04-30 16:52:49 -0700 |
| commit | c49a454210b92f45915d591cce88bd4b12eeb5b3 (patch) | |
| tree | 3df610ed6f7584b11ea99aaa5114e1eed6a5cad2 /pkgs | |
| parent | fe3590b5ba9002c1d1e71e19b79a7049c83f9698 (diff) | |
| download | nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar.gz nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar.bz2 nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar.lz nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar.xz nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.tar.zst nixlib-c49a454210b92f45915d591cce88bd4b12eeb5b3.zip | |
mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2
effectively updates them to depend on ffmpeg_3_3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6816b6956cd5..674d6f46690b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2 +, docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; buildInputs = [ - ffmpeg_3_2 freetype libass libpthreadstubs + ffmpeg freetype libass libpthreadstubs lua lua5_sockets libuchardet ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv Cocoa CoreAudio ]) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index dcdb06c215b4..dcc0f776261d 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf -, ffmpeg_3_2, x264, libvpx, libwebp +, ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection , pam }: |