grilo: 0.3.9 → 0.3.10

Dropped the meson_options patch, not sure if it was necessary.
This commit is contained in:
Tor Hedin Brønner 2019-09-15 02:05:16 +00:00
parent ade2073064
commit 6a35bd4fcf

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch , gtk-doc, docbook_xsl, docbook_xml_dtd_43
, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }:
let let
pname = "grilo"; pname = "grilo";
version = "0.3.9"; # if you change minor, also change ./setup-hook.sh version = "0.3.10"; # if you change minor, also change ./setup-hook.sh
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -13,30 +13,13 @@ in stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y";
}; };
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
mesonFlags = [ mesonFlags = [
"-Dgtk_doc=true" "-Denable-gtk-doc=true"
];
patches = [
# https://gitlab.gnome.org/GNOME/grilo/merge_requests/45
# commits are from a separate branch so they shouldn't 404
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch";
sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8";
})
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch";
sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0";
})
(fetchpatch {
url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch";
sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [