diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2016-04-01 11:26:00 +0200 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-04-01 11:26:00 +0200 |
| commit | f1beff232dc734e909f089f79b630420b20e795a (patch) | |
| tree | c5b1c13468e04e7820577ae71813fce5b1ed10f3 /pkgs/development | |
| parent | f07b934c8a9f9bde57efc14eaa348f777220cec3 (diff) | |
| parent | a37491386c795563a02917ce6c66766fd16381f0 (diff) | |
| download | nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar.gz nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar.bz2 nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar.lz nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar.xz nixlib-f1beff232dc734e909f089f79b630420b20e795a.tar.zst nixlib-f1beff232dc734e909f089f79b630420b20e795a.zip | |
Merge pull request #14357 from acowley/log4cxx
log4cxx: darwin compatibility
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/log4cxx/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index b2e13a1e9ab8..cae6e5c0a55e 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { }' src/examples/cpp/console.cpp \ src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h + sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp ''; buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; |