mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
Merge pull request #43095 from dtzWill/fix/libndctl-musl
libndctl: fix build w/musl using patch from upstream
This commit is contained in:
commit
379d4b4fa7
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
|
||||
}:
|
||||
|
||||
let
|
||||
@ -23,6 +23,14 @@ in stdenv.mkDerivation rec {
|
||||
json_c kmod systemd utillinux
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-missing-include-for-ssize_t.patch";
|
||||
url = "https://github.com/pmem/ndctl/commit/8f1798d14dda367c659b87362edb312739830ddf.patch";
|
||||
sha256 = "1jr5kh087938msl22hgjngbf025n9iplz0czmybfp7lavl73m0pm";
|
||||
})
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
substituteInPlace configure.ac --replace "which" "${which}/bin/which"
|
||||
substituteInPlace git-version --replace /bin/bash ${stdenv.shell}
|
||||
|
Loading…
Reference in New Issue
Block a user