diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-12-30 00:45:11 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-01-01 13:23:57 +0000 |
| commit | 86c68ada7089ace1ca391febe1d579cfcb4cd1e9 (patch) | |
| tree | 460c6891baa79f9aa411f84bc99eb0753e905534 | |
| parent | Merge pull request #277886 from NixOS/backport-277761-to-release-23.11 (diff) | |
| download | nixpkgs-86c68ada7089ace1ca391febe1d579cfcb4cd1e9.tar.gz | |
lbzip2: apply implicit function definition patch; fix darwin
https://github.com/kjn/lbzip2/pull/33
(cherry picked from commit eb2b02456ec19e26e5b21dc71729f9bbda2b73db)
| -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 ]; |