Merge pull request #277638 from a-n-n-a-l-e-e/lbzip2-fix
lbzip2: apply implicit function definition patch; fix darwin
This commit is contained in:
commit
27d55dfae8
1 changed files with 12 additions and 1 deletions
|
@ -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 ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue