MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 16:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

btrfs-progs: fix build with new e2fsprogs

Browse source
This commit is contained in:
Nikolay Amiantov 2018-03-22 22:16:19 +03:00
parent e31c3f8b9f
commit 26256ead32
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/filesystems/btrfs-progs/default.nix
View file

@ -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
}:
let version = "4.15.1"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
version = "4.15.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437";
};
patches = [
# Fix build with e2fsprogs 1.44.0
(fetchpatch {
url = "https://patchwork.kernel.org/patch/10281327/raw/";
sha256 = "016124hjms220809zjvvr7l1gq23j419d3piaijsaw8n7yd3kksf";
})
];
nativeBuildInputs = [
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
# 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 = ''
install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs