summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/appstream/default.nix17
-rw-r--r--pkgs/development/libraries/appstream/qt.nix2
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 264bc0e7345..5e4218852e5 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, vala
+, 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 vala
   ];
 
-  buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ];
+  buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
 
   prePatch = ''
     substituteInPlace meson.build \
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index beff83f2365..c5a251cd5f9 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 ];