diff --git a/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch b/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch index cf59380de47b..7f560d00ee26 100644 --- a/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch +++ b/pkgs/by-name/au/ausaxs/cmake-no-fetchcontent.patch @@ -1,36 +1,36 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -110,7 +110,7 @@ - set(DLIB_USE_MKL_FFT OFF) - set(DLIB_USE_FFMPEG OFF) - set(CMAKE_CXX_STANDARD 17) # dlib must be compiled with C++17 -- FetchContent_MakeAvailable(dlib) -+ add_subdirectory(dlib) - set(CMAKE_CXX_STANDARD 20) # continue with C++20 +@@ -75,7 +75,7 @@ + set(DLIB_USE_MKL_FFT OFF) + set(DLIB_USE_FFMPEG OFF) + set(CMAKE_CXX_STANDARD 17) # dlib must be compiled with C++17 +- FetchContent_MakeAvailable(dlib) ++ add_subdirectory(dlib) + set(CMAKE_CXX_STANDARD 20) # continue with C++20 + endif() add_compile_definitions("DLIB_AVAILABLE") - endif() -@@ -141,7 +141,6 @@ +@@ -106,7 +106,6 @@ thread_pool GIT_REPOSITORY https://github.com/bshoshany/thread-pool ) - FetchContent_MakeAvailable(thread_pool) + set(BS_THREAD_POOL_INCLUDE_DIR ${thread_pool_SOURCE_DIR}/include) endif() - if(USE_SYSTEM_GCEM) -@@ -151,7 +150,6 @@ +@@ -121,7 +120,6 @@ gcem GIT_REPOSITORY https://github.com/klytje/gcem ) - FetchContent_MakeAvailable(GCEM) + set(GCEM_INCLUDE_DIR ${gcem_SOURCE_DIR}/include) endif() - set_property( -@@ -160,7 +158,9 @@ +@@ -131,7 +129,9 @@ ) unset(compile_options) --include_directories(${thread_pool_SOURCE_DIR}/include ${gcem_SOURCE_DIR}/include ${backward_SOURCE_DIR}) -+include_directories(${backward_SOURCE_DIR}) +-include_directories(${BS_THREAD_POOL_INCLUDE_DIR} ${GCEM_INCLUDE_DIR} ${BACKWARD_INCLUDE_DIR}) ++include_directories(${BACKWARD_INCLUDE_DIR}) +add_subdirectory(gcem) +include_directories(thread_pool/include gcem/include) diff --git a/pkgs/by-name/au/ausaxs/package.nix b/pkgs/by-name/au/ausaxs/package.nix index 28c515891980..92a3f52dcfa0 100644 --- a/pkgs/by-name/au/ausaxs/package.nix +++ b/pkgs/by-name/au/ausaxs/package.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ausaxs"; - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "AUSAXS"; repo = "AUSAXS"; tag = "v${finalAttrs.version}"; - hash = "sha256-elzkFzLyECiDuA8TokA8/wUYBZisKY1IRxQmikMn2f4="; + hash = "sha256-H3lozYImLNwQ7FYz3idgBX/o3miSyUxdZ+ZlJQP2Xms="; }; patches = [ ./cmake-no-fetchcontent.patch ];