Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 07dcc4f43aeb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c0e51e3f83f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 21, 2016

  1. pugixml: fix darwin build

    @matthewbauer
    matthewbauer committed Nov 21, 2016
    Copy the full SHA
    e1c1fa6 View commit details

Commits on Nov 30, 2016

  1. Merge pull request #20616 from matthewbauer/pugixml-darwin 

    pugixml: fix darwin build
    @FRidh
    FRidh authored Nov 30, 2016
    Copy the full SHA
    1c0e51e View commit details
Showing with 23 additions and 1 deletion.
  1. +4 −1 pkgs/development/libraries/pugixml/default.nix
  2. +19 −0 pkgs/development/libraries/pugixml/no-long-long.patch
5 changes: 4 additions & 1 deletion pkgs/development/libraries/pugixml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,14 @@ 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/;
license = licenses.mit;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
19 changes: 19 additions & 0 deletions pkgs/development/libraries/pugixml/no-long-long.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
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)