diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-18 22:50:02 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-19 19:01:00 -0400 |
commit | 1004d0c2710187e944bd5b8af42269ade6b93bde (patch) | |
tree | 0aa43a4b58d59da906d78b4e3fc6b98de813e24b /pkgs | |
parent | 66caaf06354bdeedc3d4661c7903b37b47a092a2 (diff) | |
download | nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar.gz nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar.bz2 nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar.lz nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar.xz nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.tar.zst nixlib-1004d0c2710187e944bd5b8af42269ade6b93bde.zip |
gnome3.grilo: 0.3.7 -> 0.3.9
Patch in upstream MR to fix grilo-plugins build / NixOS compat. https://gitlab.gnome.org/GNOME/grilo/blob/grilo-0.3.9/NEWS
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/core/grilo/default.nix | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix index a2bee6ac41ee..33293f0b3cbd 100644 --- a/pkgs/desktops/gnome-3/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/core/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 +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; - version = "0.3.7"; # if you change minor, also change ./setup-hook.sh + version = "0.3.9"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,23 +13,32 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1dz965l743r4bhj78wij9k1mb6635gnkb1lnk9j7gw9dd5qsyfza"; + sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; }; - patches = [ - # Fix meson build: https://gitlab.gnome.org/GNOME/grilo/merge_requests/34 - (fetchurl { - url = "https://gitlab.gnome.org/GNOME/grilo/commit/166612aeff09e5fc2fec1f62185c84cbdcf8f889.diff"; - sha256 = "07zamy927iaa7knrwq5yxz7ypl1i02pymkcdrg5l55alhdvb81pw"; - }) - ]; - 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"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 |