From 21505290ee534ab5d651389e9facf66b8ae6f40c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Sep 2018 04:56:02 +0200 Subject: [PATCH] =?UTF-8?q?json-glib:=201.4.2=20=E2=86=92=201.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/json-glib/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index be83dbc52f45..44dd12c77509 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext +{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext , gobjectIntrospection, fixDarwinDylibNames, gnome3 }: let pname = "json-glib"; - version = "1.4.2"; + version = "1.4.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"; + sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j"; }; propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - 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;