Merge pull request #280240 from SuperSamus/vvvvvv-update
vvvvvv: 2.3.6 -> 2.4
This commit is contained in:
commit
61ef96ff00
@ -6,11 +6,10 @@
|
|||||||
, makeWrapper
|
, makeWrapper
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
|
, faudio
|
||||||
, physfs
|
, physfs
|
||||||
, SDL2
|
, SDL2
|
||||||
, SDL2_mixer
|
|
||||||
, tinyxml-2
|
, tinyxml-2
|
||||||
, utf8cpp
|
|
||||||
, Foundation
|
, Foundation
|
||||||
, IOKit
|
, IOKit
|
||||||
, makeAndPlay ? false
|
, makeAndPlay ? false
|
||||||
@ -18,19 +17,16 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vvvvvv";
|
pname = "vvvvvv";
|
||||||
version = "2.3.6";
|
version = "2.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TerryCavanagh";
|
owner = "TerryCavanagh";
|
||||||
repo = "VVVVVV";
|
repo = "VVVVVV";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ=";
|
sha256 = "sha256-AecaEWjWELRnCzTdMz+rDXVKnpPF+LNmxiKqMwQMm4k=";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
./utf8cpp.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
dataZip = fetchurl {
|
dataZip = fetchurl {
|
||||||
url = "https://thelettervsixtim.es/makeandplay/data.zip";
|
url = "https://thelettervsixtim.es/makeandplay/data.zip";
|
||||||
name = "data.zip";
|
name = "data.zip";
|
||||||
@ -45,21 +41,16 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
faudio
|
||||||
physfs
|
physfs
|
||||||
SDL2
|
SDL2
|
||||||
SDL2_mixer
|
|
||||||
tinyxml-2
|
tinyxml-2
|
||||||
utf8cpp
|
|
||||||
] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ];
|
] ++ 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";
|
cmakeDir = "../desktop_version";
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DBUNDLE_DEPENDENCIES=OFF"
|
"-DBUNDLE_DEPENDENCIES=OFF"
|
||||||
"-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'"
|
|
||||||
] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";
|
] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";
|
||||||
|
|
||||||
desktopItems = [
|
desktopItems = [
|
||||||
@ -80,8 +71,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
install -Dm755 VVVVVV $out/bin/${pname}
|
install -Dm755 VVVVVV $out/bin/${pname}
|
||||||
install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png"
|
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
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
@ -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)
|
|
Loading…
Reference in New Issue
Block a user