appstream-glib: 0.7.2 → 0.7.6

+43 -13
+32 -13
pkgs/development/libraries/appstream-glib/default.nix
··· 1 - { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib 2 - , gtk_doc, libarchive, gobjectIntrospection 3 - , sqlite, libsoup, gcab, attr, acl, docbook_xsl 1 + { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib 2 + , gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant 3 + , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 4 4 , libuuid, json_glib, meson, gperf, ninja 5 5 }: 6 6 stdenv.mkDerivation rec { 7 - name = "appstream-glib-0.7.2"; 7 + name = "appstream-glib-0.7.6"; 8 + 9 + outputs = [ "out" "dev" "man" ]; 10 + outputBin = "dev"; 8 11 9 12 src = fetchFromGitHub { 10 13 owner = "hughsie"; 11 14 repo = "appstream-glib"; 12 15 rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; 13 - sha256 = "1jvwfida12d2snc8p9lpbpqzrixw2naaiwfmsrldwkrxsj3i19pl"; 16 + sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv"; 14 17 }; 15 18 16 - nativeBuildInputs = [ meson pkgconfig ninja ]; 17 - buildInputs = [ glib gtk_doc gettext sqlite libsoup 18 - gcab attr acl docbook_xsl libuuid json_glib 19 - libarchive gobjectIntrospection gperf ]; 19 + nativeBuildInputs = [ 20 + meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 21 + ]; 22 + buildInputs = [ 23 + glib gettext sqlite libsoup 24 + gcab attr acl libuuid json_glib 25 + libarchive gobjectIntrospection gperf 26 + ]; 20 27 propagatedBuildInputs = [ gtk3 ]; 21 - mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ]; 28 + 29 + patches = [ 30 + (substituteAll { 31 + src = ./paths.patch; 32 + pngquant= "${pngquant}/bin/pngquant"; 33 + }) 34 + ]; 35 + 36 + mesonFlags = [ 37 + "-Drpm=false" 38 + "-Dstemmer=false" 39 + "-Ddep11=false" 40 + ]; 22 41 23 42 meta = with stdenv.lib; { 24 43 description = "Objects and helper methods to read and write AppStream metadata"; 25 - homepage = https://github.com/hughsie/appstream-glib; 26 - license = licenses.lgpl21Plus; 27 - platforms = platforms.linux; 44 + homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; 45 + license = licenses.lgpl2Plus; 46 + platforms = platforms.linux; 28 47 maintainers = with maintainers; [ lethalman matthewbauer ]; 29 48 }; 30 49 }
+11
pkgs/development/libraries/appstream-glib/paths.patch
··· 1 + --- a/libappstream-builder/asb-utils.c 2 + +++ b/libappstream-builder/asb-utils.c 3 + @@ -294,7 +294,7 @@ 4 + { 5 + g_autofree gchar *standard_error = NULL; 6 + gint exit_status = 0; 7 + - const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger", 8 + + const gchar *argv[] = { "@pngquant@", "--skip-if-larger", 9 + "--strip", "--ext", ".png", 10 + "--force", "--speed", "1", filename, NULL }; 11 + if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE))