diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:57:05 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:04:28 +0000 |
commit | a0842e8b20cbe1ed717b72775428d1f8fc047fa4 (patch) | |
tree | b86d0614a477f7e092d626d59b888d085aaca400 /nixpkgs/pkgs/development/libraries/libxmlb/default.nix | |
parent | c36b32d476b520ed0d2a37cd0973f98583d6dc7c (diff) | |
parent | 8d1510abfb592339e13ce8f6db6f29c1f8b72924 (diff) | |
download | nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.gz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.bz2 nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.lz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.xz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.zst nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.zip |
Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxmlb/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libxmlb/default.nix | 60 |
1 files changed, 53 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 9edb9b475e8a..4800a6c405c3 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -1,25 +1,65 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, docbook_xml_dtd_43 +, docbook_xsl +, glib +, gobject-introspection +, gtk-doc +, libuuid +, meson +, ninja +, pkgconfig +, python3 +, shared-mime-info +, nixosTests +}: stdenv.mkDerivation rec { - name = "libxmlb-${version}"; - version = "0.1.10"; + pname = "libxmlb"; + version = "0.1.11"; - outputs = [ "out" "lib" "dev" "devdoc" ]; + outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; src = fetchFromGitHub { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd"; + sha256 = "1503v76w7543snqyjxykiqa5va62zb0ccn3jlw0gpdx8973v80mr"; }; - nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; + patches = [ + # Fix installed tests + # https://github.com/hughsie/libxmlb/pull/2 + (fetchpatch { + url = "https://github.com/hughsie/libxmlb/commit/78850c8b0f644f729fa21e2bf9ebed0d9d6010f3.diff"; + sha256 = "0zw7c6vy8hscln7za7ijqd9svirach3zdskvbzyxxcsm3xcwxpjm"; + }) - buildInputs = [ glib libuuid ]; + ./installed-tests-path.patch + ]; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gobject-introspection + gtk-doc + meson + ninja + pkgconfig + (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + shared-mime-info + ]; + + buildInputs = [ + glib + libuuid + ]; mesonFlags = [ "--libexecdir=${placeholder "out"}/libexec" "-Dgtkdoc=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; preCheck = '' @@ -28,6 +68,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + tests = { + installed-tests = nixosTests.libxmlb; + }; + }; + meta = with stdenv.lib; { description = "A library to help create and query binary XML blobs"; homepage = https://github.com/hughsie/libxmlb; |