diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-15 02:05:16 +0000 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-09-30 19:39:49 +0200 |
| commit | 6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f (patch) | |
| tree | 4baf3f9f3cf9c337099fd51b8cbc3d4c202376cf /pkgs/development/libraries/grilo | |
| parent | ade2073064887c2312ed1a78c3bdf3a54e4b3734 (diff) | |
| download | nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar.gz nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar.bz2 nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar.lz nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar.xz nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.tar.zst nixpkgs-6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f.zip | |
grilo: 0.3.9 → 0.3.10
Dropped the meson_options patch, not sure if it was necessary.
Diffstat (limited to 'pkgs/development/libraries/grilo')
| -rw-r--r-- | pkgs/development/libraries/grilo/default.nix | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b2a7f0bd5ae..79ccc931972 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,10 +1,10 @@ { 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 }: let 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 { name = "${pname}-${version}"; @@ -13,30 +13,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; + sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y"; }; setupHook = ./setup-hook.sh; mesonFlags = [ - "-Dgtk_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"; - }) + "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ |