diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/development/libraries/libchamplain/default.nix | |
parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libchamplain/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libchamplain/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix b/nixpkgs/pkgs/development/libraries/libchamplain/default.nix index b8d25f48b3b7..1a0be52dbbe5 100644 --- a/nixpkgs/pkgs/development/libraries/libchamplain/default.nix +++ b/nixpkgs/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 { |