diff options
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/Makefile.patch | 13 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 21 |
2 files changed, 12 insertions, 22 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch b/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch deleted file mode 100644 index 812f9954cf20..000000000000 --- a/pkgs/tools/filesystems/bcachefs-tools/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index af7a206..553ac70 100644 ---- a/Makefile -+++ b/Makefile -@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr) - INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools - else - ROOT_SBINDIR=$(PREFIX)/sbin -- INITRAMFS_DIR=/etc/initramfs-tools -+ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools - endif - - .PHONY: all diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 1fafe7412d87..b919d5808756 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium -, keyutils, liburcu, zlib, libaio, zstd }: +{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-04-10"; + name = "bcachefs-tools-unstable-2018-07-21"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "c598d91dcb0c7e95abdacb2711898ae14ab52ca1"; - sha256 = "1mglw6p1145nryn8babkg2hj778kqa0vrzjbdp9kxjlyb3fksmff"; + rev = "cecf7e05e151499a3e96dc05f97f37c14162e94b"; + sha256 = "18vmyrjwza1iv0apkykbqsnnic5lrqlwfsrj85pgrpwzii36i8i0"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ]; - patches = [ ./Makefile.patch ]; - + buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; installFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + sed -i \ + "s,INITRAMFS_DIR=/etc/initramfs-tools,INITRAMFS_DIR=$out/etc/initramfs-tools,g" Makefile + ''; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; homepage = https://bcachefs.org/; license = licenses.gpl2; - maintainers = with maintainers; [ davidak chiiruno]; + maintainers = with maintainers; [ davidak chiiruno ]; platforms = platforms.linux; }; } |