diff options
| author | Shea Levy <shea@shealevy.com> | 2013-03-11 21:21:01 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-03-11 21:21:01 -0400 |
| commit | 90e93635e9dc04e294e4e4cc49eda328c183bc30 (patch) | |
| tree | 971d2807c5e29375b30f6376549fb6b9424c07bf /pkgs/development/libraries/tinyxml | |
| parent | aeb00df015ae38528dad89626a58683b387a7ac7 (diff) | |
| parent | acf4697a5f17d460295b5eff3a2b119a35ea46d2 (diff) | |
| download | nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar.gz nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar.bz2 nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar.lz nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar.xz nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.tar.zst nixlib-90e93635e9dc04e294e4e4cc49eda328c183bc30.zip | |
Merge branch 'xbmc-12' of git://github.com/iElectric/nixpkgs
Upgrades xbmc to version 12. It builds successfully, and Domen is the maintainer. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/development/libraries/tinyxml')
| -rw-r--r-- | pkgs/development/libraries/tinyxml/2.6.2.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 8770859817ca..fb2ff0b84f05 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -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 \ |