Switched xbmc to pythonFull. Fixes python plugin errors.

This commit is contained in:
Chong Li 2013-12-11 21:12:40 +01:00
parent ee8a58a72f
commit 0e18b7cd97

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper { stdenv, lib, fetchurl, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python , pkgconfig, cmake, gnumake, yasm, pythonFull
, boost, avahi, libdvdcss, lame , boost, avahi, libdvdcss, lame
, gettext, pcre, yajl, fribidi , gettext, pcre, yajl, fribidi
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
pkgconfig cmake gnumake yasm python pkgconfig cmake gnumake yasm pythonFull
boost libmicrohttpd boost libmicrohttpd
gettext pcre yajl fribidi gettext pcre yajl fribidi
openssl gperf tinyxml2 taglib libssh swig jre openssl gperf tinyxml2 taglib libssh swig jre
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
for p in $(ls $out/bin/) ; do for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \ wrapProgram $out/bin/$p \
--prefix PATH ":" "${python}/bin" \ --prefix PATH ":" "${pythonFull}/bin" \
--prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${glxinfo}/bin" \
--prefix PATH ":" "${xdpyinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \