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: cd34bf3e2917
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e173880ed54b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2020

  1. pugixml: 1.9 -> 1.10 

    * split to multiple outputs when using the shared library version
* enabled the tests
* validate the pkg-config files
    @freezeboy
    freezeboy authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    e173880 View commit details
Showing with 19 additions and 12 deletions.
  1. +19 −12 pkgs/development/libraries/pugixml/default.nix
31 changes: 19 additions & 12 deletions pkgs/development/libraries/pugixml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }:

stdenv.mkDerivation rec {
pname = "pugixml";
version = "1.9";
version = "1.10";

src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
rev = "v${version}";
sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv";
sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4=";
};

patches = [
# To be removed after a version newer than 1.9 is released
(fetchpatch {
url = "https://github.com/zeux/pugixml/pull/193.patch";
sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka";
})
outputs = if shared then [ "out" "dev" ] else [ "out" ];

nativeBuildInputs = [ cmake validatePkgConfig ];

cmakeFlags = [
"-DBUILD_TESTS=ON"
"-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}"
];

nativeBuildInputs = [ cmake ];
checkInputs = [ check ];

cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
# Hack to be able to run the test, broken because we use
# CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
preBuild = if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else ''
export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';

preConfigure = ''
# Enable long long support (required for filezilla)
sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
'';

meta = with stdenv.lib; {
meta = with lib; {
description = "Light-weight, simple and fast XML parser for C++ with XPath support";
homepage = "https://pugixml.org";
license = licenses.mit;