diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-01 22:18:53 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-06 16:36:28 -0400 |
| commit | 5c80a3585ba05a8179c51bd4889c31432f70dc70 (patch) | |
| tree | 9db31df7beac55520371460b838765f785c297a4 /pkgs/development/libraries/tinyxml | |
| parent | 71a9eb80e78698efcf4cdcdd10e66933d276c5bf (diff) | |
| download | nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar.gz nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar.bz2 nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar.lz nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar.xz nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.tar.zst nixpkgs-5c80a3585ba05a8179c51bd4889c31432f70dc70.zip | |
tinyxml2: fix cross compilation
- use native unzip - add target prefix to LD
Diffstat (limited to 'pkgs/development/libraries/tinyxml')
| -rw-r--r-- | pkgs/development/libraries/tinyxml/2.6.2.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 0cc4038b64e..22c7f6934d9 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation { ./2.6.2-cxx.patch ]; - preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}"; + preConfigure = "export LD=${stdenv.cc.targetPrefix}c++"; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) sed '1i#define TIXML_USE_STL 1' -i tinyxml.h |