cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

jazz2: drop graphicsLibrary, switch to SDL2 by default

Browse source 
glfw seems broken and can't find wayland libs
This commit is contained in:
nat 2024-04-29 21:53:01 +02:00
parent a7931adab8
commit e8255a4f68
No known key found for this signature in database
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/by-name/ja/jazz2/package.nix
View file

@ -1,6 +1,5 @@
{ cmake { cmake
, fetchFromGitHub , fetchFromGitHub
, glfw
, jazz2-content , jazz2-content
, lib , lib
, libopenmpt , libopenmpt
@ -10,10 +9,8 @@
, stdenv , stdenv
, testers , testers
, zlib , zlib
, graphicsLibrary ? "GLFW"
}: }:
assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ];
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "jazz2"; pname = "jazz2";
version = "2.6.0"; version = "2.6.0";
@ -28,16 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ ./nocontent.patch ]; patches = [ ./nocontent.patch ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libopenmpt libvorbis openal zlib ] buildInputs = [ libopenmpt libvorbis openal SDL2 zlib ];
++ lib.optionals (graphicsLibrary == "GLFW") [ glfw ]
++ lib.optionals (graphicsLibrary == "SDL2") [ SDL2 ];
cmakeFlags = [ cmakeFlags = [
"-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt" "-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt"
"-DNCINE_DOWNLOAD_DEPENDENCIES=OFF" "-DNCINE_DOWNLOAD_DEPENDENCIES=OFF"
"-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}" "-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}"
] ++ lib.optionals (graphicsLibrary == "GLFW") [
"-DGLFW_INCLUDE_DIR=${glfw}/include/GLFW"
]; ];
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {