summary refs log tree commit diff
path: root/pkgs/development/libraries/libchamplain
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-03-05 21:00:30 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-03-05 21:46:35 +0100
commit6b8c1d9f4e792914fcad718d7e9b661c636de921 (patch)
tree43c7e6835d2ec483eb470847c235f8b0aafa9f02 /pkgs/development/libraries/libchamplain
parentc547c03c90033e594d935fe399b9e781cf308748 (diff)
downloadnixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar.gz
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar.bz2
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar.lz
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar.xz
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.tar.zst
nixpkgs-6b8c1d9f4e792914fcad718d7e9b661c636de921.zip
libchamplain: 0.12.16 → 0.12.19
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
Diffstat (limited to 'pkgs/development/libraries/libchamplain')
-rw-r--r--pkgs/development/libraries/libchamplain/default.nix26
1 files 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 = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+
+  buildInputs = [ sqlite libsoup ];
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection ];
+  propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk ];
 
-  propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];
+  mesonFlags = [
+    "-Dgtk_doc=true"
+    "-Dvapi=true"
+  ];
 
   passthru = {
     updateScript = gnome3.updateScript {