jazz2: drop graphicsLibrary, switch to SDL2 by default
glfw seems broken and can't find wayland libs
This commit is contained in:
parent
a7931adab8
commit
e8255a4f68
1 changed files with 1 additions and 8 deletions
|
@ -1,6 +1,5 @@
|
|||
{ cmake
|
||||
, fetchFromGitHub
|
||||
, glfw
|
||||
, jazz2-content
|
||||
, lib
|
||||
, libopenmpt
|
||||
|
@ -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";
|
||||
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue