diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-05-03 17:17:34 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-03 21:30:48 +0200 |
commit | d96f262166fe0d6cd62d301007e743581ec4a05d (patch) | |
tree | 2b398328414425c114eef4a29656380ec18460e3 /pkgs/development/libraries/json-c/default.nix | |
parent | 208e7cae1aa08fee29e252242f811335f997c604 (diff) | |
download | nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar.gz nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar.bz2 nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar.lz nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar.xz nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.tar.zst nixpkgs-d96f262166fe0d6cd62d301007e743581ec4a05d.zip |
json-c: update to 0.12, fixing CVE-2013-{6370,6371}
Diffstat (limited to 'pkgs/development/libraries/json-c/default.nix')
-rw-r--r-- | pkgs/development/libraries/json-c/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 78100521584..ad425f2a381 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,20 +1,32 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "json-c-0.9"; + name = "json-c-0.12"; src = fetchurl { - url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz"; - sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh"; + url = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz"; + sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg"; }; + + patches = [ ./unused-variable.patch ]; + + buildInputs = [ autoreconfHook ]; # won't configure without it, no idea why + + # compatibility hack (for mypaint at least) + postInstall = '' + ln -s json-c.pc "$out/lib/pkgconfig/json.pc" + ''; + meta = with stdenv.lib; { - homepage = "http://oss.metaparadigm.com/json-c/"; description = "A JSON implementation in C"; + homepage = https://github.com/json-c/json-c/wiki; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + longDescription = '' JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. ''; - hydraPlatforms = platforms.linux; }; } |