diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-11 10:56:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 10:56:06 +0200 |
| commit | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (patch) | |
| tree | 2613747f3037ace2443d0b18d10b557e002681d8 | |
| parent | 152f609b44b4e7d1b2ac9d718fb3bdd43c5cedca (diff) | |
| parent | 1b3bdf7fce8f2e0f3de1f1027787d75e2b35d741 (diff) | |
| download | nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar.gz nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar.bz2 nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar.lz nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar.xz nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.tar.zst nixlib-3a2786eea085f040a66ecde1bc3ddc7099f6dbeb.zip | |
Merge pull request #254470 from wegank/performous-bump
performous: 1.2.0 -> 1.3.0
| -rw-r--r-- | pkgs/games/performous/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/games/performous/performous-cmake.patch | 36 |
2 files changed, 30 insertions, 28 deletions
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 2faa90006b55..c82e1d02afc7 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -5,9 +5,9 @@ , aubio , boost , cmake -, ffmpeg_4 +, ffmpeg +, fmt , gettext -, git , glew , glibmm , glm @@ -15,6 +15,7 @@ , libepoxy , librsvg , libxmlxx +, nlohmann_json , pango , pkg-config , portaudio @@ -22,17 +23,17 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "performous"; + repo = "performous"; rev = "refs/tags/${version}"; - hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg="; + hash = "sha256-y7kxLht15vULN9NxM0wzj9+7Uq4/3D5j9oBEnrTIwQ8="; }; cedSrc = fetchFromGitHub { - owner = pname; + owner = "performous"; repo = "compact_enc_det"; rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e"; hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec="; @@ -46,6 +47,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir ced-src cp -R ${cedSrc}/* ced-src + + substituteInPlace data/CMakeLists.txt \ + --replace "/usr" "$out" ''; nativeBuildInputs = [ @@ -58,7 +62,8 @@ stdenv.mkDerivation rec { SDL2 aubio boost - ffmpeg_4 + ffmpeg + fmt glew glibmm glm @@ -66,6 +71,7 @@ stdenv.mkDerivation rec { libepoxy librsvg libxmlxx + nlohmann_json pango portaudio ]; diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch index 5c1a4c91012b..dae399cd54de 100644 --- a/pkgs/games/performous/performous-cmake.patch +++ b/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) |