summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorCray Elliott <MP2E@archlinux.us>2017-04-24 14:47:46 -0700
committerCray Elliott <MP2E@archlinux.us>2017-04-30 16:52:49 -0700
commitc49a454210b92f45915d591cce88bd4b12eeb5b3 (patch)
tree3df610ed6f7584b11ea99aaa5114e1eed6a5cad2 /pkgs/tools/X11
parentfe3590b5ba9002c1d1e71e19b79a7049c83f9698 (diff)
downloadnixlib-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/tools/X11')
-rw-r--r--pkgs/tools/X11/xpra/default.nix2
1 files changed, 1 insertions, 1 deletions
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 }: