Merge pull request #212426 from surfaceflinger/master
This commit is contained in:
commit
830d948f46
|
@ -14752,6 +14752,12 @@
|
||||||
githubId = 187109;
|
githubId = 187109;
|
||||||
name = "Bjarki Ágúst Guðmundsson";
|
name = "Bjarki Ágúst Guðmundsson";
|
||||||
};
|
};
|
||||||
|
surfaceflinger = {
|
||||||
|
email = "nat@nekopon.pl";
|
||||||
|
github = "surfaceflinger";
|
||||||
|
githubId = 44725111;
|
||||||
|
name = "nat";
|
||||||
|
};
|
||||||
suryasr007 = {
|
suryasr007 = {
|
||||||
email = "94suryateja@gmail.com";
|
email = "94suryateja@gmail.com";
|
||||||
github = "suryasr007";
|
github = "suryasr007";
|
||||||
|
|
20
pkgs/games/jazz2/content.nix
Normal file
20
pkgs/games/jazz2/content.nix
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{ jazz2
|
||||||
|
, lib
|
||||||
|
, runCommand
|
||||||
|
}:
|
||||||
|
|
||||||
|
runCommand "jazz2-content"
|
||||||
|
{
|
||||||
|
inherit (jazz2) version src;
|
||||||
|
|
||||||
|
preferLocalBuild = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Assets needed for jazz2";
|
||||||
|
homepage = "https://github.com/deathkiller/jazz2-native";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = with maintainers; [ surfaceflinger ];
|
||||||
|
};
|
||||||
|
} ''
|
||||||
|
cp -r $src/Content $out
|
||||||
|
''
|
47
pkgs/games/jazz2/game.nix
Normal file
47
pkgs/games/jazz2/game.nix
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{ cmake
|
||||||
|
, fetchFromGitHub
|
||||||
|
, glew
|
||||||
|
, glfw
|
||||||
|
, jazz2-content
|
||||||
|
, lib
|
||||||
|
, libGL
|
||||||
|
, libopenmpt
|
||||||
|
, libvorbis
|
||||||
|
, openal
|
||||||
|
, SDL2
|
||||||
|
, stdenv
|
||||||
|
, xorg
|
||||||
|
, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "jazz2";
|
||||||
|
version = "1.8.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "deathkiller";
|
||||||
|
repo = "jazz2-native";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "fi1waoLAcnZB0lX+8+wQFoBYOSvVXYK3JKiu81GGF4U=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [ ./nocontent.patch ];
|
||||||
|
|
||||||
|
buildInputs = [ libGL SDL2 zlib glew glfw openal libvorbis libopenmpt xorg.libSM xorg.libICE xorg.libXext ];
|
||||||
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DNCINE_DOWNLOAD_DEPENDENCIES=OFF"
|
||||||
|
"-DGLFW_INCLUDE_DIR=${glfw}/include/GLFW"
|
||||||
|
"-DLIBOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include/libopenmpt"
|
||||||
|
"-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Open-source Jazz Jackrabbit 2 reimplementation";
|
||||||
|
homepage = "https://github.com/deathkiller/jazz2-native";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = with maintainers; [ surfaceflinger ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
12
pkgs/games/jazz2/nocontent.patch
Normal file
12
pkgs/games/jazz2/nocontent.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/cmake/ncine_installation.cmake b/cmake/ncine_installation.cmake
|
||||||
|
index 9ccb707..89c350f 100644
|
||||||
|
--- a/cmake/ncine_installation.cmake
|
||||||
|
+++ b/cmake/ncine_installation.cmake
|
||||||
|
@@ -195,7 +195,6 @@ endif()
|
||||||
|
#endif()
|
||||||
|
|
||||||
|
if(NOT EMSCRIPTEN)
|
||||||
|
- install(DIRECTORY "${NCINE_ROOT}/Content/" DESTINATION ${DATA_INSTALL_DESTINATION})
|
||||||
|
else()
|
||||||
|
install(FILES "${CMAKE_BINARY_DIR}/${CPACK_EXECUTABLE_NAME}.html" DESTINATION ".")
|
||||||
|
install(FILES "${CMAKE_BINARY_DIR}/${CPACK_EXECUTABLE_NAME}.data" DESTINATION ".")
|
|
@ -35894,6 +35894,10 @@ with pkgs;
|
||||||
|
|
||||||
fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
|
fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
|
||||||
|
|
||||||
|
jazz2 = callPackage ../games/jazz2/game.nix { };
|
||||||
|
|
||||||
|
jazz2-content = callPackage ../games/jazz2/content.nix { };
|
||||||
|
|
||||||
jumpy = callPackage ../games/jumpy { };
|
jumpy = callPackage ../games/jumpy { };
|
||||||
|
|
||||||
flightgear = libsForQt5.callPackage ../games/flightgear { };
|
flightgear = libsForQt5.callPackage ../games/flightgear { };
|
||||||
|
|
Loading…
Reference in a new issue