nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

pugixml: 1.9 -> 1.10

Browse Source 
* split to multiple outputs when using the shared library version
* enabled the tests
* validate the pkg-config files
This commit is contained in:
freezeboy 2020-11-05 14:14:28 +01:00 committed by Jonathan Ringer
parent cd34bf3e29
commit e173880ed5
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,41 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: { stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pugixml"; pname = "pugixml";
version = "1.9"; version = "1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zeux"; owner = "zeux";
repo = "pugixml"; repo = "pugixml";
rev = "v${version}"; rev = "v${version}";
sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4=";
}; };
patches = [ outputs = if shared then [ "out" "dev" ] else [ "out" ];
# To be removed after a version newer than 1.9 is released
(fetchpatch { nativeBuildInputs = [ cmake validatePkgConfig ];
url = "https://github.com/zeux/pugixml/pull/193.patch";
sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; 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 = '' preConfigure = ''
# Enable long long support (required for filezilla) # Enable long long support (required for filezilla)
sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp 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"; description = "Light-weight, simple and fast XML parser for C++ with XPath support";
homepage = "https://pugixml.org"; homepage = "https://pugixml.org";
license = licenses.mit; license = licenses.mit;