about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libxmlxx
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-06-19 19:22:30 +0000
committerAlyssa Ross <hi@alyssa.is>2019-06-19 19:22:30 +0000
commit6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch)
treec5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/development/libraries/libxmlxx
parentef93931efff0323fd13c4270415b578c73b5ef35 (diff)
parent83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff)
downloadnixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst
nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxmlxx')
-rw-r--r--nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
index 5e1e947b8f7c..94c2ca095829 100644
--- a/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libxml++-${maj_ver}.${min_ver}";
-  maj_ver = "3.0";
-  min_ver = "1";
+  pname = "libxml++";
+  version = "3.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
+    url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
   };
 
-  outputs = [ "out" "devdoc" ];
+  outputs = [ "out" "dev" "doc" "devdoc" ];
 
   nativeBuildInputs = [ pkgconfig perl ];
 
@@ -18,6 +17,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libxml2 ];
 
+  postFixup = ''
+    substituteInPlace $dev/lib/pkgconfig/libxml++-3.0.pc \
+      --replace 'docdir=''${datarootdir}' "docdir=$doc/share"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://libxmlplusplus.sourceforge.net/;
     description = "C++ wrapper for the libxml2 XML parser library, version 3";