diff options
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/4.4.1.nix | 31 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 35 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix new file mode 100644 index 000000000000..afafa4ec1743 --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt +}: + +let version = "4.4.1"; in + +stdenv.mkDerivation rec { + name = "btrfs-progs-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; + }; + + buildInputs = [ + pkgconfig attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # 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"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ nckx raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9729e2945d31..8d8a007525a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11935,7 +11935,10 @@ let dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { go = go_1_4; }; + docker = callPackage ../applications/virtualization/docker { + btrfs-progs = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; + go = go_1_4; + }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; |