diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
| commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
| tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/games/performous/performous-cmake.patch | |
| parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
| parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
| download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/games/performous/performous-cmake.patch')
| -rw-r--r-- | nixpkgs/pkgs/games/performous/performous-cmake.patch | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/games/performous/performous-cmake.patch b/nixpkgs/pkgs/games/performous/performous-cmake.patch index 5c1a4c91012b..dae399cd54de 100644 --- a/nixpkgs/pkgs/games/performous/performous-cmake.patch +++ b/nixpkgs/pkgs/games/performous/performous-cmake.patch @@ -1,21 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48af2a89..43786c31 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,15 +75,7 @@ else() - message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") - endif() - --include(FetchContent) --FetchContent_Declare(ced-sources -- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git -- #https://github.com/google/compact_enc_det.git -- GIT_TAG master -- SOURCE_DIR ced-src --) +diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake +index d6e2aca..3085adb 100644 +--- a/cmake/Modules/FindCed.cmake ++++ b/cmake/Modules/FindCed.cmake +@@ -1,11 +1 @@ +-include(LibFetchMacros) +- +-set(Ced_GIT_VERSION "master") - --FetchContent_MakeAvailable(ced-sources) -+add_subdirectory(ced-src) - - option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE) - +-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) |