summary refs log tree commit diff
path: root/pkgs/development/libraries/pugixml
diff options
context:
space:
mode:
authorIoannis Koutras <ioannis.koutras@gmail.com>2019-03-02 13:13:26 +0200
committerIoannis Koutras <ioannis.koutras@gmail.com>2019-03-02 13:13:26 +0200
commit236c7db82ceae53fbf9adf729e4aed9bdada020b (patch)
tree8b8c90b3fd9cab332a5b0f4565b6aa2bedee82e7 /pkgs/development/libraries/pugixml
parent8571a669a7e0b77313221e273f4fc19ca4cd624f (diff)
downloadnixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar.gz
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar.bz2
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar.lz
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar.xz
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.tar.zst
nixpkgs-236c7db82ceae53fbf9adf729e4aed9bdada020b.zip
pugixml: fix pkg-config file installation
Diffstat (limited to 'pkgs/development/libraries/pugixml')
-rw-r--r--pkgs/development/libraries/pugixml/default.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index cd774ad8516..74c6e8ef1b3 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/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}";
@@ -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)