diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-26 16:20:28 +0100 |
| commit | 647438344bfc1f77791391e2b4f98eef865c63dc (patch) | |
| tree | ef580867fc6cc413940e4330d939cf1afda082cb /nixpkgs/pkgs/games/performous/performous-cmake.patch | |
| parent | b084c6a0fab7f32c904c5c8e8db8dddcefbe507f (diff) | |
| parent | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (diff) | |
| download | nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.gz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.bz2 nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.lz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.xz nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.tar.zst nixlib-647438344bfc1f77791391e2b4f98eef865c63dc.zip | |
Merge commit 'e3474e1d1e53'
Diffstat (limited to 'nixpkgs/pkgs/games/performous/performous-cmake.patch')
| -rw-r--r-- | nixpkgs/pkgs/games/performous/performous-cmake.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/games/performous/performous-cmake.patch b/nixpkgs/pkgs/games/performous/performous-cmake.patch index dae399cd54de..6f56959792cd 100644 --- a/nixpkgs/pkgs/games/performous/performous-cmake.patch +++ b/nixpkgs/pkgs/games/performous/performous-cmake.patch @@ -1,17 +1,18 @@ diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake -index d6e2aca..3085adb 100644 +index 5794bc84..08d6b49d 100644 --- a/cmake/Modules/FindCed.cmake +++ b/cmake/Modules/FindCed.cmake -@@ -1,11 +1 @@ --include(LibFetchMacros) -- --set(Ced_GIT_VERSION "master") -- --libfetch_git_pkg(Ced -- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git -- #https://github.com/google/compact_enc_det.git -- REFERENCE ${Ced_GIT_VERSION} -- FIND_PATH compact_enc_det/compact_enc_det.h --) --message(STATUS "Found Google CED ${Ced_VERSION}") -+add_subdirectory(../ced-src ced-src) +@@ -22,12 +22,7 @@ elseif(SELF_BUILT_CED STREQUAL "AUTO") + pkg_check_modules(CED IMPORTED_TARGET GLOBAL CED) + if(NOT CED_FOUND) + message(STATUS "ced build from source because not found on system") +- libfetch_git_pkg(Ced +- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- REFERENCE ${Ced_GIT_VERSION} +- FIND_PATH compact_enc_det/compact_enc_det.h +- ) ++ add_subdirectory(../ced-src ced-src) + else() + add_library(ced ALIAS PkgConfig::CED) + set(Ced_VERSION ${CED_VERSION}) |