diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-06 12:07:37 +0200 |
commit | f504af072bc5cf49da008e6970c214255d5f46ed (patch) | |
tree | f2849cd5d239a32d7a2fbdff1dc5b3a0ed369b96 /pkgs/development/libraries/appstream | |
parent | 11ceef47699fb0911bea790e4b8059d97e95ad14 (diff) | |
parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
download | nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.gz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.bz2 nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.lz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.xz nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.tar.zst nixlib-f504af072bc5cf49da008e6970c214255d5f46ed.zip |
Merge branch 'master' into staging-next
There's been some large rebuild on master. I don't really have time ATM to find what it was.
Diffstat (limited to 'pkgs/development/libraries/appstream')
-rw-r--r-- | pkgs/development/libraries/appstream/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/appstream/qt.nix | 2 |
2 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 61ee182ce627..5e4218852e51 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,36 +1,27 @@ { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection -, pcre, itstool +, pcre, itstool, gperf, vala }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.11.8"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; + sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; }; - patches = [ - # drop this in version 0.11.9 and above - (fetchpatch { - name = "define-location-and-soname.patch"; - url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; - sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection itstool + gobjectIntrospection itstool vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ]; prePatch = '' substituteInPlace meson.build \ @@ -43,7 +34,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" - "-Dgir=false" + "-Dvapi=true" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index beff83f2365b..c5a251cd5f9f 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "appstream-qt-${version}"; - inherit (appstream) version src patches prePatch; + inherit (appstream) version src prePatch; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; |