Skip to content

Commit

Permalink
pugixml: fix pkg-config file installation
Browse files Browse the repository at this point in the history
  • Loading branch information
jokogr committed Mar 2, 2019
1 parent 8571a66 commit 236c7db
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions pkgs/development/libraries/pugixml/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, shared ? false }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:

stdenv.mkDerivation rec {
name = "pugixml-${version}";
Expand All @@ -11,9 +11,17 @@ stdenv.mkDerivation rec {
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)
Expand Down

0 comments on commit 236c7db

Please sign in to comment.