diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-11-06 00:31:46 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-11-06 00:32:31 +0300 |
commit | aeb032044d31be54cad6225208fd0929e5878e96 (patch) | |
tree | 342c912e621263808d753a6d3c65914c19912e0d /pkgs | |
parent | d66bf89faab9ad437268b6e6f77882133a2ab42e (diff) |
Readd BtrFS-progs 3.16 for snapper build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/filesystems/btrfsprogs/3.16.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/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix new file mode 100644 index 0000000000000..e1d4b8bd31cf5 --- /dev/null +++ b/pkgs/tools/filesystems/btrfsprogs/3.16.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: + +let version = "3.16"; 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 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; + }; + + buildInputs = [ + attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bde3f44c881f..edb7a762f5b9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -642,6 +642,7 @@ let bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + btrfsProgs-3_16 = callPackage ../tools/filesystems/btrfsprogs/3.16.nix { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -10503,7 +10504,9 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { }; + snapper = callPackage ../tools/misc/snapper { + btrfsProgs = btrfsProgs-3_16; + }; snd = callPackage ../applications/audio/snd { }; |