diff options
| author | Will Cohen <willcohen@users.noreply.github.com> | 2023-05-19 14:30:56 -0400 |
|---|---|---|
| committer | Will Cohen <willcohen@users.noreply.github.com> | 2023-05-22 09:23:38 -0400 |
| commit | 3ce345322d8a2f04c15ec246034db51ae3869926 (patch) | |
| tree | 2118ce676da05bbd810dea52afecae2674a9f359 | |
| parent | 8392a8baa91cb35716b0b37d74542b8b44afbaf0 (diff) | |
| download | nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar.gz nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar.bz2 nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar.lz nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar.xz nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.tar.zst nixpkgs-3ce345322d8a2f04c15ec246034db51ae3869926.zip | |
json-c: fix build on LLVM 15+
| -rw-r--r-- | pkgs/development/libraries/json-c/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index d6aac7161d4..785548c211a 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "json-c"; version = "0.16"; - src = fetchurl { - url = "https://s3.amazonaws.com/json-c_releases/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-jkWsj5bsd5Hq87t+5Q6cIQC7vIe40PHQMMW6igKI2Ws="; + src = fetchFromGitHub { + owner = "json-c"; + repo = "json-c"; + rev = "json-c-0.16-20220414"; + sha256 = "sha256-KbnUWLgpg6/1wvXhUoYswyqDcgiwEcvgaWCPjNcX20o="; }; + patches = [ + # needed for emscripten, which uses LLVM 15+ + (fetchpatch { + url = "https://github.com/json-c/json-c/commit/6eca65617aacd19f4928acd5766b8dd20eda0b34.patch"; + sha256 = "sha256-fyugX+HgYlt/4AVtfNDaKS+blyUt8JYTNqkmhURb9dk="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; |