diff options
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/miro/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/pitivi/default.nix | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 1dbe34553b0a..b8a161649889 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -12,7 +12,7 @@ # TODO: package and use libappindicator { stdenv, config, fetchurl, - python, pkgconfig, yasm, + python2, pkgconfig, yasm, autoconf, automake, libtool, m4, libass, libsamplerate, fribidi, libxml2, bzip2, libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ]; + nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ]; buildInputs = [ fribidi fontconfig freetype hicolor_icon_theme libass libsamplerate libxml2 bzip2 diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 1926913c8d04..dccb84127336 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper -, pkgconfig, cmake, gnumake, yasm, pythonFull +, pkgconfig, cmake, gnumake, yasm, python2 , boost, avahi, libdvdcss, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper libxml2 gnutls - pkgconfig cmake gnumake yasm pythonFull + pkgconfig cmake gnumake yasm python2 boost libmicrohttpd autoreconfHook gettext pcre-cpp yajl fribidi libva openssl gperf tinyxml2 taglib libssh swig jre @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${pythonFull}/bin" \ + --prefix PATH ":" "${python2}/bin" \ --prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 9e08f2fffb16..0652ac7e6642 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -75,7 +75,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python + pygobject2 pygtk pycurl mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index d487f07e3d6d..c2c64bfa4966 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-validate ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo sqlite3 matplotlib + python pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]); |