diff --git a/pkgs/by-name/gr/grenedalf/fix-genesis-cmake.patch b/pkgs/by-name/gr/grenedalf/fix-genesis-cmake.patch new file mode 100644 index 000000000000..823229964223 --- /dev/null +++ b/pkgs/by-name/gr/grenedalf/fix-genesis-cmake.patch @@ -0,0 +1,16 @@ +diff --git a/libs/genesis/lib/genesis/CMakeLists.txt b/libs/genesis/lib/genesis/CMakeLists.txt +index 8660c78..caa7618 100644 +--- a/libs/genesis/lib/genesis/CMakeLists.txt ++++ b/libs/genesis/lib/genesis/CMakeLists.txt +@@ -66,11 +66,6 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.9.0") + endif() + endif() + +-# Add htslib as a dependency, so that CMake realizes that it has to be built. +-IF(GENESIS_USE_HTSLIB) +- add_dependencies( genesis_lib_obj htslib ) +-ENDIF() +- + # Same for samtools. Not used at the moment though. + # IF(GENESIS_USE_SAMTOOLS) + # add_dependencies( genesis_lib_obj samtools ) \ No newline at end of file diff --git a/pkgs/by-name/gr/grenedalf/package.nix b/pkgs/by-name/gr/grenedalf/package.nix index 914df31011c4..115c0f0d6dd6 100644 --- a/pkgs/by-name/gr/grenedalf/package.nix +++ b/pkgs/by-name/gr/grenedalf/package.nix @@ -26,20 +26,31 @@ let "--disable-libcurl" "--disable-plugins" ]; + # Patches break the build + patches = [ ]; }); in stdenv.mkDerivation (finalAttrs: { pname = "grenedalf"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "lczech"; repo = "grenedalf"; tag = "v${finalAttrs.version}"; - hash = "sha256-DJ7nZjOvYFQlN/L+S2QcMVvH/M9Dhla4VXl2nxc22m4="; + hash = "sha256-RD2WYhGBPJuBmbqrjDqujKj/djnxA5ED/LFmhHYIFyE="; fetchSubmodules = true; }; + patches = [ + ./fix-genesis-cmake.patch + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required (VERSION 3.5 FATAL_ERROR)" + ''; + nativeBuildInputs = [ cmake pkg-config