diff --git a/pkgs/sambamba.nix b/pkgs/sambamba.nix index d0b5755..55bcb40 100644 --- a/pkgs/sambamba.nix +++ b/pkgs/sambamba.nix @@ -1,40 +1,29 @@ { stdenv, fetchFromGitHub, ldc -, bash, python, glibc, which, rdmd, zlib }: +, python3, glibc, which, zlib }: stdenv.mkDerivation rec { - version = "0.6.7"; + version = "0.6.9"; name = "sambamba-${version}"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; - rev = "v${version}"; - sha256 = "06fj6ayr57xcpinmsdmczfay13bbmq2f6zlvknzz9yhgsdkny9w3"; + # Two commits on top of 0.6.9 release to remove undeaD submodule + rev = "d67cf50280f7c752d815fdb50fc38fb7bb61f2c9"; + sha256 = "1skv12nx84dsxh71ixw605k6pasbjlbwiij2s9382gsw2ya6nhv7"; fetchSubmodules = true; }; - postPatch = '' - patchShebangs . - sed -i '1s,$, undeaD/src/undead/utf.d,' *.rsp - ''; - - buildPhase = '' - make sambamba-ldmd2-64 - ''; - - installPhase = '' - mkdir -p $out/bin - mv build/sambamba $out/bin - mv build/sambamba.debug $out/bin + installFlags = [ "prefix=$(out)" ]; + preInstall = '' + mkdir -p "$out"/bin ''; buildInputs = [ - bash - python + python3 glibc ldc which - rdmd zlib ];