From 6b8c1d9f4e792914fcad718d7e9b661c636de921 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 5 Mar 2019 21:00:30 +0100 Subject: [PATCH] =?UTF-8?q?libchamplain:=200.12.16=20=E2=86=92=200.12.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mainly meson port. https://mail.gnome.org/archives/libchamplain-list/2019-February/msg00001.html https://mail.gnome.org/archives/libchamplain-list/2019-February/msg00002.html https://mail.gnome.org/archives/libchamplain-list/2019-March/msg00000.html --- .../libraries/libchamplain/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index b8d25f48b3b..1a0be52dbbe 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,23 +1,27 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkgconfig, glib, gtk3, cairo, sqlite, gnome3 , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: -let - pname = "libchamplain"; - version = "0.12.16"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "libchamplain"; + version = "0.12.19"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "191aid1qsfkab5whbzj2r3g63dpdgrwp5141mfywvqyvdhr2x11n"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; + buildInputs = [ sqlite libsoup ]; + + propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dvapi=true" + ]; passthru = { updateScript = gnome3.updateScript {