Skip to content

Commit

Permalink
lbzip2: apply implicit function definition patch; fix darwin
Browse files Browse the repository at this point in the history
kjn/lbzip2#33
(cherry picked from commit eb2b024)
  • Loading branch information
annalee authored and github-actions[bot] committed Jan 1, 2024
1 parent 49f5ac1 commit 86c68ad
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion pkgs/tools/compression/lbzip2/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, gnulib, perl, autoconf, automake }:

stdenv.mkDerivation rec {
pname = "lbzip2";
Expand All @@ -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 ];

Expand Down

0 comments on commit 86c68ad

Please sign in to comment.