diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-02-04 00:54:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-04 00:54:33 +0100 |
| commit | 61ef96ff0057ec7e8f073dd45ab31b4b7648002b (patch) | |
| tree | 2be26713b61e22c6a6c286dc9508a22eb9eb40cb /pkgs | |
| parent | fda10193850e1d254519f759584697b069a8e440 (diff) | |
| parent | 8d51652b7db0f90f1c293a2b54a6effe1e3fa365 (diff) | |
| download | nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar.gz nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar.bz2 nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar.lz nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar.xz nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.tar.zst nixlib-61ef96ff0057ec7e8f073dd45ab31b4b7648002b.zip | |
Merge pull request #280240 from SuperSamus/vvvvvv-update
vvvvvv: 2.3.6 -> 2.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/vvvvvv/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/games/vvvvvv/utf8cpp.patch | 13 |
2 files changed, 11 insertions, 28 deletions
diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix index 909bfa430d70..07f98d94f3e1 100644 --- a/pkgs/games/vvvvvv/default.nix +++ b/pkgs/games/vvvvvv/default.nix @@ -6,11 +6,10 @@ , makeWrapper , copyDesktopItems , makeDesktopItem +, faudio , physfs , SDL2 -, SDL2_mixer , tinyxml-2 -, utf8cpp , Foundation , IOKit , makeAndPlay ? false @@ -18,19 +17,16 @@ stdenv.mkDerivation rec { pname = "vvvvvv"; - version = "2.3.6"; + version = "2.4"; src = fetchFromGitHub { owner = "TerryCavanagh"; repo = "VVVVVV"; rev = version; - sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; + sha256 = "sha256-AecaEWjWELRnCzTdMz+rDXVKnpPF+LNmxiKqMwQMm4k="; + fetchSubmodules = true; }; - patches = [ - ./utf8cpp.patch - ]; - dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; @@ -45,21 +41,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + faudio physfs SDL2 - SDL2_mixer tinyxml-2 - utf8cpp ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]; - # Help CMake find SDL_mixer.h - env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; - cmakeDir = "../desktop_version"; cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" - "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; desktopItems = [ @@ -80,8 +71,13 @@ stdenv.mkDerivation rec { install -Dm755 VVVVVV $out/bin/${pname} install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png" + cp -r "$src/desktop_version/fonts/" "$out/share/" + cp -r "$src/desktop_version/lang/" "$out/share/" - wrapProgram $out/bin/${pname} --add-flags "-assets ${dataZip}" + wrapProgram $out/bin/${pname} \ + --add-flags "-assets ${dataZip}" \ + --add-flags "-langdir $out/share/lang" \ + --add-flags "-fontsdir $out/share/fonts" runHook postInstall ''; diff --git a/pkgs/games/vvvvvv/utf8cpp.patch b/pkgs/games/vvvvvv/utf8cpp.patch deleted file mode 100644 index fc279564e759..000000000000 --- a/pkgs/games/vvvvvv/utf8cpp.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) |