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

pugixml: fixup darwin

Browse Source
This commit is contained in:
Matthew Bauer 2017-04-11 01:03:11 -05:00
parent 87e6b2c50f
commit f1fdc98884
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/pugixml/default.nix
View File

@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
''; '';
patches = []
++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Light-weight, simple and fast XML parser for C++ with XPath support"; description = "Light-weight, simple and fast XML parser for C++ with XPath support";
homepage = http://pugixml.org/; homepage = http://pugixml.org/;

19
pkgs/development/libraries/pugixml/no-long-long.patch
View File

@ -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)