3
0
Fork 0
forked from mirrors/nixpkgs

appstream-glib: 0.7.2 → 0.7.6

This commit is contained in:
Jan Tojnar 2017-12-20 06:32:16 +01:00
parent 8340cc5c6a
commit 6665d4faa9
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 43 additions and 13 deletions

View file

@ -1,30 +1,49 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
, gtk_doc, libarchive, gobjectIntrospection , gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant
, sqlite, libsoup, gcab, attr, acl, docbook_xsl , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42
, libuuid, json_glib, meson, gperf, ninja , libuuid, json_glib, meson, gperf, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "appstream-glib-0.7.2"; name = "appstream-glib-0.7.6";
outputs = [ "out" "dev" "man" ];
outputBin = "dev";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hughsie"; owner = "hughsie";
repo = "appstream-glib"; repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
sha256 = "1jvwfida12d2snc8p9lpbpqzrixw2naaiwfmsrldwkrxsj3i19pl"; sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv";
}; };
nativeBuildInputs = [ meson pkgconfig ninja ]; nativeBuildInputs = [
buildInputs = [ glib gtk_doc gettext sqlite libsoup meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42
gcab attr acl docbook_xsl libuuid json_glib ];
libarchive gobjectIntrospection gperf ]; buildInputs = [
glib gettext sqlite libsoup
gcab attr acl libuuid json_glib
libarchive gobjectIntrospection gperf
];
propagatedBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ gtk3 ];
mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
patches = [
(substituteAll {
src = ./paths.patch;
pngquant= "${pngquant}/bin/pngquant";
})
];
mesonFlags = [
"-Drpm=false"
"-Dstemmer=false"
"-Ddep11=false"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Objects and helper methods to read and write AppStream metadata"; description = "Objects and helper methods to read and write AppStream metadata";
homepage = https://github.com/hughsie/appstream-glib; homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
license = licenses.lgpl21Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ lethalman matthewbauer ]; maintainers = with maintainers; [ lethalman matthewbauer ];
}; };
} }

View file

@ -0,0 +1,11 @@
--- a/libappstream-builder/asb-utils.c
+++ b/libappstream-builder/asb-utils.c
@@ -294,7 +294,7 @@
{
g_autofree gchar *standard_error = NULL;
gint exit_status = 0;
- const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger",
+ const gchar *argv[] = { "@pngquant@", "--skip-if-larger",
"--strip", "--ext", ".png",
"--force", "--speed", "1", filename, NULL };
if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE))