diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-11 01:03:11 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-04-11 01:03:11 -0500 |
| commit | f1fdc988844926f90c855f55b66955d61034569a (patch) | |
| tree | 6ba674622a646586fd3bec9abe5acd98da2517b1 /pkgs/development/libraries/pugixml | |
| parent | 87e6b2c50fb4520d9ef910418f3c686d830dc3df (diff) | |
| download | nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar.gz nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar.bz2 nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar.lz nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar.xz nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.tar.zst nixpkgs-f1fdc988844926f90c855f55b66955d61034569a.zip | |
pugixml: fixup darwin
Diffstat (limited to 'pkgs/development/libraries/pugixml')
| -rw-r--r-- | pkgs/development/libraries/pugixml/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/pugixml/no-long-long.patch | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 8c40ff2be20..d9d0afa2bde 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - patches = [] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ]; - meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = http://pugixml.org/; diff --git a/pkgs/development/libraries/pugixml/no-long-long.patch b/pkgs/development/libraries/pugixml/no-long-long.patch deleted file mode 100644 index 46c54e85a1d..00000000000 --- a/pkgs/development/libraries/pugixml/no-long-long.patch +++ /dev/null @@ -1,19 +0,0 @@ -Get rid of long-long feature. This breaks on AppleClang compilers. ---- -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40a7ab0..c84f0f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ else() - endif() - - # Enable C++11 long long for compilers that are capable of it --if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -- target_compile_features(pugixml PUBLIC cxx_long_long_type) --endif() -+# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -+# target_compile_features(pugixml PUBLIC cxx_long_long_type) -+# endif() - - set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1) - |