diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2024-01-01 13:23:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-01 13:23:27 +0000 |
| commit | 27d55dfae865ef8d180095b722798923653dbe33 (patch) | |
| tree | 26fbac9968fade4ebd00f7b094a1feeeaf09c97a | |
| parent | f3963e147637be9a964c30c62c00fa13ec330d9a (diff) | |
| parent | eb2b02456ec19e26e5b21dc71729f9bbda2b73db (diff) | |
| download | nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar.gz nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar.bz2 nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar.lz nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar.xz nixlib-27d55dfae865ef8d180095b722798923653dbe33.tar.zst nixlib-27d55dfae865ef8d180095b722798923653dbe33.zip | |
Merge pull request #277638 from a-n-n-a-l-e-e/lbzip2-fix
lbzip2: apply implicit function definition patch; fix darwin
| -rw-r--r-- | pkgs/tools/compression/lbzip2/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 6d4017ac62ca..2e7557a310e5 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { pname = "lbzip2"; @@ -11,6 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; + patches = [ + # This avoids an implicit function declaration when building gnulib's + # xmalloc.c, addressing a build failure with future compiler version. + # https://github.com/kjn/lbzip2/pull/33 + (fetchpatch { + name = "GNULIB_XALLOC_DIE.patch"; + url = "https://github.com/kjn/lbzip2/commit/32b5167940ec817e454431956040734af405a9de.patch"; + hash = "sha256-YNgmkh4bksIq5kBgZP+8o97aMm9CzFZldfUW6L5DGXk="; + }) + ]; + buildInputs = [ gnulib perl ]; nativeBuildInputs = [ autoconf automake ]; |