diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-22 16:59:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-22 16:59:46 +0100 |
commit | 01b6d8bd71495595ca79f22a7376faa41f3738d5 (patch) | |
tree | 26ec75457598f875e828de9ef70abcf7774663af /pkgs/games | |
parent | b7deed0c08ec730957c643cc1372dc56e55dd4ac (diff) | |
parent | 80aced8d5cb1612e18f4d3d943810c654f1ba921 (diff) |
Merge pull request #259774 from surfaceflinger/jazz2-finalattrs
jazz2: switch to finalAttrs, use runCommandLocal for content, migrate to by-name
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/jazz2/content.nix | 20 | ||||
-rw-r--r-- | pkgs/games/jazz2/game.nix | 47 | ||||
-rw-r--r-- | pkgs/games/jazz2/nocontent.patch | 12 |
3 files changed, 0 insertions, 79 deletions
diff --git a/pkgs/games/jazz2/content.nix b/pkgs/games/jazz2/content.nix deleted file mode 100644 index 0a0e72075635a..0000000000000 --- a/pkgs/games/jazz2/content.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ 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 -'' diff --git a/pkgs/games/jazz2/game.nix b/pkgs/games/jazz2/game.nix deleted file mode 100644 index 22ddbfe337a70..0000000000000 --- a/pkgs/games/jazz2/game.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ cmake -, fetchFromGitHub -, glew -, glfw -, jazz2-content -, lib -, libGL -, libopenmpt -, libvorbis -, openal -, SDL2 -, stdenv -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - pname = "jazz2"; - version = "2.1.0"; - - src = fetchFromGitHub { - owner = "deathkiller"; - repo = "jazz2-native"; - rev = version; - sha256 = "nJha7+geP2Ov7ciEDzJ+XWdiF1jzv4Oeis1DwxcpJXo="; - }; - - 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; - }; -} diff --git a/pkgs/games/jazz2/nocontent.patch b/pkgs/games/jazz2/nocontent.patch deleted file mode 100644 index 28ced9426b49a..0000000000000 --- a/pkgs/games/jazz2/nocontent.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ".") |