ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 15:36:47 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25392 from armijnhemel/json-c

Browse Source 
json-c: 0.12 -> 0.12.1
This commit is contained in:
Jörg Thalheim 2017-05-01 17:57:41 +02:00 committed by GitHub
commit 27b7e2f7da
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/json-c/default.nix
View File

@ -1,14 +1,12 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "json-c-0.12";
name = "json-c-0.12.1";
src = fetchurl {
url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg";
sha256 = "148jkvpnxmg1fwwigp0nq9qbd5vzpnmgiw3y34w7k6fymalpsqas";
};
patches = [ ./unused-variable.patch ];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why

18
pkgs/development/libraries/json-c/unused-variable.patch
View File

@ -1,18 +0,0 @@
See https://groups.google.com/forum/#!topic/json-c/TYodemkG338
diff --git a/json_tokener.c b/json_tokener.c
index 19de8ef..32bc8af 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
case json_tokener_state_inf: /* aka starts with 'i' */
{
- int size;
int size_inf;
int is_negative = 0;
printbuf_memappend_fast(tok->pb, &c, 1);
- size = json_min(tok->st_pos+1, json_null_str_len);
size_inf = json_min(tok->st_pos+1, json_inf_str_len);
char *infbuf = tok->pb->buf;
if (*infbuf == '-')