diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-12-17 10:36:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 10:36:24 -0500 |
| commit | a6bf3d54f96968afe63cdf4e1c18b9b25bf6269a (patch) | |
| tree | d812896b1bb2ce96b2989cbb88815151bea08d24 /pkgs/games | |
| parent | c870bb3f90e1e1d91a8d1d165ae243204c891f83 (diff) | |
| parent | adadeffea9192691f1068afa9759f75ecc1b5b8b (diff) | |
Merge pull request #272856 from aaronjheng/utf8cpp-4
utf8cpp: 3.2.5 -> 4.0.3
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/vvvvvv/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/games/vvvvvv/utf8cpp.patch | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix index 6fc3ab6ecef58..909bfa430d702 100644 --- a/pkgs/games/vvvvvv/default.nix +++ b/pkgs/games/vvvvvv/default.nix @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; }; - sourceRoot = "${src.name}/desktop_version"; + + patches = [ + ./utf8cpp.patch + ]; + dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; @@ -51,7 +55,12 @@ stdenv.mkDerivation rec { # Help CMake find SDL_mixer.h env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; - cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; + cmakeDir = "../desktop_version"; + + cmakeFlags = [ + "-DBUNDLE_DEPENDENCIES=OFF" + "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" + ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/games/vvvvvv/utf8cpp.patch b/pkgs/games/vvvvvv/utf8cpp.patch new file mode 100644 index 0000000000000..fc279564e759b --- /dev/null +++ b/pkgs/games/vvvvvv/utf8cpp.patch @@ -0,0 +1,13 @@ +diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt +index 7405c122..68ba40e3 100644 +--- a/desktop_version/CMakeLists.txt ++++ b/desktop_version/CMakeLists.txt +@@ -296,7 +296,7 @@ if(BUNDLE_DEPENDENCIES) + else() + find_package(utf8cpp CONFIG) + +- target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp lodepng-static) ++ target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp::utf8cpp lodepng-static) + endif() + + # SDL2 Dependency (Detection pulled from FAudio) |