alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #56692 from jokogr/f/pugixml-1.9

Browse source 
pugixml: Fix pkg-config file installation and use fetchFromGitHub
This commit is contained in:
Pascal Wittmann 2019-03-03 08:55:08 +01:00 committed by GitHub
parent 365d199173 236c7db82c
commit c318db2c03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/pugixml/default.nix
View file

@ -1,17 +1,27 @@
{ stdenv, fetchurl, cmake, shared ? false }: { stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pugixml-${version}"; name = "pugixml-${version}";
version = "1.9"; version = "1.9";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; owner = "zeux";
sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; repo = "pugixml";
rev = "v${version}";
sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv";
}; };
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";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"} -DBUILD_PKGCONFIG=ON" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
preConfigure = '' preConfigure = ''
# Enable long long support (required for filezilla) # Enable long long support (required for filezilla)