From dedfc00204ba1a35ae620ceb25709d4618bca17a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 16 Jun 2016 19:14:36 +0000 Subject: [PATCH] appstream-glib: 0.3.6 -> 0.5.11 - needed for gnome-software to build --- .../libraries/appstream-glib/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 14fbcdf7342..e6051552ab7 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, glib +{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib , gtk_doc, autoconf, automake, libtool, libarchive, libyaml , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl +, libuuid, json_glib }: stdenv.mkDerivation rec { - name = "appstream-glib-0.3.6"; + name = "appstream-glib-0.5.11"; - src = fetchurl { - url = "https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_6.tar.gz"; - sha256 = "1zdxg9dk9vxw2cs04cswd138di3dysz0hxk4918750hh19s3859c"; + src = fetchFromGitHub { + owner = "hughsie"; + repo = "appstream-glib"; + rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; + sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh"; }; - buildInputs = [ glib libtool pkgconfig gtk_doc gettext intltool sqlite libsoup - gcab attr acl docbook_xsl - libarchive libyaml gtk3 autoconf automake gobjectIntrospection ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]; + buildInputs = [ glib gtk_doc gettext sqlite libsoup + gcab attr acl docbook_xsl libuuid json_glib + libarchive libyaml gtk3 gobjectIntrospection ]; configureScript = "./autogen.sh"; @@ -22,7 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/hughsie/appstream-glib; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ lethalman matthewbauer ]; }; - }