mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake
|
|
index 789739ec8..6c86a7b8c 100644
|
|
--- a/cmake/custom/nevpt2.cmake
|
|
+++ b/cmake/custom/nevpt2.cmake
|
|
@@ -67,6 +67,7 @@ list(APPEND NEVPT2CMakeArgs
|
|
"-DMOLCAS_BUILD_DIR=${PROJECT_BINARY_DIR}"
|
|
"-DCMAKE_Fortran_MODULE_DIRECTORY=${mod_dir}"
|
|
"-DDMRG_INCLUDE=${HDF5_QCM_INCLUDE}"
|
|
+ "-DCMAKE_SKIP_BUILD_RPATH=ON"
|
|
)
|
|
|
|
if(HDF5_ROOT)
|
|
@@ -118,9 +119,7 @@ endif ()
|
|
|
|
ExternalProject_Add(${EP_PROJECT}
|
|
PREFIX ${CUSTOM_NEVPT2_LOCATION}
|
|
- GIT_REPOSITORY ${reference_git_repo}
|
|
- GIT_TAG ${reference_git_commit}
|
|
- UPDATE_DISCONNECTED ${EP_SkipUpdate}
|
|
+ URL @nevpt2_src_url@
|
|
CMAKE_ARGS "${NEVPT2CMakeArgs}"
|
|
INSTALL_DIR "${PROJECT_BINARY_DIR}/qcmaquis"
|
|
)
|
|
diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake
|
|
index 5fd1ef207..8d2957c6e 100644
|
|
--- a/cmake/custom/qcmaquis.cmake
|
|
+++ b/cmake/custom/qcmaquis.cmake
|
|
@@ -77,6 +77,7 @@ list (APPEND QCMaquisCMakeArgs
|
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
|
-DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS}
|
|
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
|
|
+ -DCMAKE_SKIP_BUILD_RPATH=ON
|
|
)
|
|
if (HDF5_ROOT)
|
|
list (APPEND QCMaquisCMakeArgs
|
|
@@ -274,10 +275,7 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work?
|
|
|
|
ExternalProject_Add (${EP_PROJECT}
|
|
PREFIX ${extprojpath}
|
|
- GIT_REPOSITORY ${reference_git_repo}
|
|
- GIT_TAG ${reference_git_commit}
|
|
- UPDATE_DISCONNECTED ${EP_SkipUpdate}
|
|
-
|
|
+ URL @qcmaquis_src_url@
|
|
SOURCE_SUBDIR dmrg
|
|
CMAKE_ARGS ${EP_CMAKE_ARGS}
|
|
CMAKE_CACHE_ARGS ${EP_CMAKE_CACHE_ARGS}
|