diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2019-03-03 08:55:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-03 08:55:08 +0100 |
commit | c318db2c03c9f67c75959ea9bbc0b4dc45bea17f (patch) | |
tree | 911cb5980a4ed853e175dbf4c472dd2ef02ed393 | |
parent | 365d199173fc52fb00e9a0fdf1cbbe514d839d53 (diff) | |
parent | 236c7db82ceae53fbf9adf729e4aed9bdada020b (diff) | |
download | nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar.gz nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar.bz2 nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar.lz nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar.xz nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.tar.zst nixlib-c318db2c03c9f67c75959ea9bbc0b4dc45bea17f.zip |
Merge pull request #56692 from jokogr/f/pugixml-1.9
pugixml: Fix pkg-config file installation and use fetchFromGitHub
-rw-r--r-- | pkgs/development/libraries/pugixml/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 19d1328d6bfb..74c6e8ef1b30 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,17 +1,27 @@ -{ stdenv, fetchurl, cmake, shared ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { name = "pugixml-${version}"; version = "1.9"; - src = fetchurl { - url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; + src = fetchFromGitHub { + owner = "zeux"; + 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 ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"} -DBUILD_PKGCONFIG=ON" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; preConfigure = '' # Enable long long support (required for filezilla) |