From f1fdc988844926f90c855f55b66955d61034569a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 11 Apr 2017 01:03:11 -0500 Subject: pugixml: fixup darwin --- pkgs/development/libraries/pugixml/default.nix | 3 --- pkgs/development/libraries/pugixml/no-long-long.patch | 19 ------------------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/libraries/pugixml/no-long-long.patch (limited to 'pkgs/development/libraries/pugixml') 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) - -- cgit 1.4.1