diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-22 22:16:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-22 22:16:19 +0300 |
| commit | 26256ead321df1efde762bbd47f37f1b1074d5b0 (patch) | |
| tree | df3151d07d71f846ea9ab928bc11b3bf34ad4bc6 /pkgs/tools/filesystems | |
| parent | e31c3f8b9f6e4d550b39744be7d26ec532be7169 (diff) | |
| download | nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar.gz nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar.bz2 nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar.lz nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar.xz nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.tar.zst nixlib-26256ead321df1efde762bbd47f37f1b1074d5b0.zip | |
btrfs-progs: fix build with new e2fsprogs
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 09f004f28440..c49b0269cb0f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -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 |