diff options
| author | legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> | 2022-01-10 17:27:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 17:27:53 -0600 |
| commit | a85c71ab7f011e1d84bf49bbab651bccc0e8c322 (patch) | |
| tree | 6e3b74bb9d04fcb5668e1924ce5556a9dd22db31 /pkgs/development | |
| parent | e004d0984144e8f2775275fce04187050933aa1c (diff) | |
| parent | 5bf9a07184467db9c1e7f4484b121dd1986eeecd (diff) | |
Merge pull request #154191 from lourkeur/unbreak/chiapos
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/chiapos/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index a74bfb8495dbf..a5ebf97b151a1 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -2,6 +2,7 @@ , substituteAll , buildPythonPackage , fetchPypi +, catch2 , cmake , cxxopts , ghc_filesystem @@ -27,6 +28,7 @@ buildPythonPackage rec { (substituteAll { src = ./dont_fetch_dependencies.patch; inherit cxxopts ghc_filesystem; + catch2_src = catch2.src; pybind11_src = pybind11.src; }) ]; diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 85b7560f5d0d7..05bd212e9a6c9 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b757b70..fcce055 100644 +index 5d7862b..c2d06a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) @@ -29,3 +29,13 @@ index b757b70..fcce055 100644 ) FetchContent_MakeAvailable(gulrak) +@@ -150,8 +147,7 @@ ENDIF() + + FetchContent_Declare( + Catch2 +- GIT_REPOSITORY https://github.com/catchorg/Catch2.git +- GIT_TAG v2.13.7 ++ SOURCE_DIR @catch2_src@ + ) + FetchContent_MakeAvailable(Catch2) + |