Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 6 insertions, 3 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix
index 04512e8e372e..f6267a2e017f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/science/biology/lumpy/default.nix
@@ -7,13 +7,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "lumpy";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "arq5x";
     repo = "lumpy-sv";
-    rev = version;
-    sha256 = "0azhzvmh9az9jcq0xprlzdz6w16azgszv4kshb903bwbnqirmk18";
+    rev = "v${version}";
+    sha256 = "0r71sg7qch8r6p6dw995znrqdj6q49hjdylhzbib2qmv8nvglhs9";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ which ];
@@ -26,6 +27,8 @@ in stdenv.mkDerivation rec {
     # Use Nix htslib over bundled version
     sed -i 's/lumpy_filter: htslib/lumpy_filter:/' Makefile
     sed -i 's|../../lib/htslib/libhts.a|-lhts|' src/filter/Makefile
+    # Also make sure we use the includes from Nix's htslib
+    sed -i 's|../../lib/htslib/|${htslib}|' src/filter/Makefile
   '';
 
   # Upstream's makefile doesn't have an install target