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

Merge branch 'xbmc-12' of git://github.com/iElectric/nixpkgs

Browse Source 
Upgrades xbmc to version 12. It builds successfully, and Domen is the
maintainer.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-03-11 21:21:01 -04:00
commit 90e93635e9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/xbmc/default.nix
View File

@ -2,7 +2,7 @@
, pkgconfig, cmake, gnumake, yasm, python
, boost
, gettext, pcre, yajl, fribidi
, openssl, gperf
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
, libX11, xproto, inputproto
, libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto
@ -30,11 +30,11 @@ assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
stdenv.mkDerivation rec {
name = "xbmc-11.0";
name = "xbmc-12.0";
src = fetchurl {
url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
sha256 = "1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19";
sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
};
buildInputs = [
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gnumake yasm python
boost
gettext pcre yajl fribidi
openssl gperf
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto
libXt libXmu libXext xextproto
libXinerama libXrandr randrproto

6
pkgs/development/libraries/tinyxml/2.6.2.nix
View File

@ -20,8 +20,12 @@ in stdenv.mkDerivation {
buildInputs = [ unzip ];
buildPhase = ''
# use STL (xbmc requires it)
sed '1i#define TIXML_USE_STL 1' -i tinyxml.h
sed '1i#define TIXML_USE_STL 1' -i xmltest.cpp
# build xmltest
make
make
# build the lib as a shared library
g++ -Wall -O2 -shared -fpic tinyxml.cpp \