Skip to content

Commit

Permalink
jazz2: drop graphicsLibrary, switch to SDL2 by default
Browse files Browse the repository at this point in the history
glfw seems broken and can't find wayland libs
  • Loading branch information
surfaceflinger committed Apr 29, 2024
1 parent a7931ad commit e8255a4
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions pkgs/by-name/ja/jazz2/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ cmake
, fetchFromGitHub
, glfw
, jazz2-content
, lib
, libopenmpt
Expand All @@ -10,10 +9,8 @@
, stdenv
, testers
, zlib
, graphicsLibrary ? "GLFW"
}:

assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ];
stdenv.mkDerivation (finalAttrs: {
pname = "jazz2";
version = "2.6.0";
Expand All @@ -28,16 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./nocontent.patch ];

nativeBuildInputs = [ cmake ];
buildInputs = [ libopenmpt libvorbis openal zlib ]
++ lib.optionals (graphicsLibrary == "GLFW") [ glfw ]
++ lib.optionals (graphicsLibrary == "SDL2") [ SDL2 ];
buildInputs = [ libopenmpt libvorbis openal SDL2 zlib ];

cmakeFlags = [
"-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt"
"-DNCINE_DOWNLOAD_DEPENDENCIES=OFF"
"-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}"
] ++ lib.optionals (graphicsLibrary == "GLFW") [
"-DGLFW_INCLUDE_DIR=${glfw}/include/GLFW"
];

passthru.tests.version = testers.testVersion {
Expand Down

0 comments on commit e8255a4

Please sign in to comment.