diff options
| -rw-r--r-- | pkgs/development/libraries/libxmlxx/v3.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ffado/default.nix | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 5e1e947b8f7..94c2ca09582 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/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"; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 3d6f00ba97a..3d2c6ae6dae 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -53,6 +53,11 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + # prevent build tools from leaking into closure + echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt + ''; + meta = with stdenv.lib; { homepage = http://www.ffado.org; description = "FireWire audio drivers"; |