diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-10-12 23:30:40 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-11-05 20:44:14 +0100 |
| commit | 01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117 (patch) | |
| tree | ca4a7f1f531d33db1545adb65fec7e26f3a1954f /pkgs/development/libraries/json-glib | |
| parent | db16b930394ba40ecacba6b3c3b4202b18456ad2 (diff) | |
| download | nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar.gz nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar.bz2 nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar.lz nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar.xz nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.tar.zst nixlib-01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117.zip | |
json_glib: 1.2.0 → 1.4.2
Diffstat (limited to 'pkgs/development/libraries/json-glib')
| -rw-r--r-- | pkgs/development/libraries/json-glib/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9d434c088bad..2414931e76aa 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "json-glib-${minVer}.0"; - minVer = "1.2"; + name = "json-glib-${minVer}.2"; + minVer = "1.4"; src = fetchurl { url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz"; - sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr"; + sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"; }; - configureflags= "--with-introspection"; - - propagatedBuildInputs = [ glib gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ + # https://gitlab.gnome.org/GNOME/json-glib/issues/27 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff"; + sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c"; + }) + ]; + outputs = [ "out" "dev" ]; + doCheck = true; + + checkPhase = "meson test"; + meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; |