btrfs-progs: fix build with new e2fsprogs
This commit is contained in:
parent
e31c3f8b9f
commit
26256ead32
|
@ -1,17 +1,24 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
|
||||||
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
|
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "4.15.1"; in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "btrfs-progs-${version}";
|
name = "btrfs-progs-${version}";
|
||||||
|
version = "4.15.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||||
sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
|
sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Fix build with e2fsprogs 1.44.0
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://patchwork.kernel.org/patch/10281327/raw/";
|
||||||
|
sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
|
pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
|
||||||
];
|
];
|
||||||
|
@ -20,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# gcc bug with -O1 on ARM with gcc 4.8
|
# gcc bug with -O1 on ARM with gcc 4.8
|
||||||
# This should be fine on all platforms so apply universally
|
# This should be fine on all platforms so apply universally
|
||||||
patchPhase = "sed -i s/-O1/-O2/ configure";
|
postPatch = "sed -i s/-O1/-O2/ configure";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
|
install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs
|
||||||
|
|
Loading…
Reference in a new issue