diff options
Diffstat (limited to 'pkgs/tools/filesystems/btrfs-progs/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 09f004f28440..e84260052a41 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,12 +27,14 @@ 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 ''; + configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; |