git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #154191 from lourkeur/unbreak/chiapos
commita85c71ab7f011e1d84bf49bbab651bccc0e8c322 authorlegendofmiracles <30902201+legendofmiracles@users.noreply.github.com> dateMon 10 Jan 2022, 17:27 (5 years ago) parente004d095bf9a07
2 files changed+13−1
compare with master
unifiedsplit
pkgs/development/python-modules/chiapos/default.nix+2 pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch+11−1
pkgs/development/python-modules/chiapos/default.nix+2
@@ -2,6 +2,7 @@
22, substituteAll
33, buildPythonPackage
44, fetchPypi
5+, catch2
56, cmake
67, cxxopts
78, ghc_filesystem
@@ -27,6 +28,7 @@ buildPythonPackage rec {
2728 (substituteAll {
2829 src = ./dont_fetch_dependencies.patch;
2930 inherit cxxopts ghc_filesystem;
31+ catch2_src = catch2.src;
3032 pybind11_src = pybind11.src;
3133 })
3234 ];
pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch+11−1
@@ -1,5 +1,5 @@
11diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index b757b70..fcce055 100644
2+index 5d7862b..c2d06a1 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
55@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
@@ -29,3 +29,13 @@ index b757b70..fcce055 100644
2929 )
3030 FetchContent_MakeAvailable(gulrak)
3131
32+@@ -150,8 +147,7 @@ ENDIF()
33+
34+ FetchContent_Declare(
35+ Catch2
36+- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
37+- GIT_TAG v2.13.7
38++ SOURCE_DIR @catch2_src@
39+ )
40+ FetchContent_MakeAvailable(Catch2)
41+