diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-01 00:23:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 00:23:12 +0200 |
| commit | a92b3a32a85c195ef789d138bd1d971c28059f6f (patch) | |
| tree | de7b7fccba73153d2b16eb992686b7f963834d0f | |
| parent | 4ad9f644052004e5bc560234a61b9a71966f79df (diff) | |
| parent | e8255a4f68f7679de07b78390787a086ac31291f (diff) | |
Merge pull request #307825 from surfaceflinger/jazz2-wayland-fix
jazz2: drop graphicsLibrary, switch to SDL2 by default
| -rw-r--r-- | pkgs/by-name/ja/jazz2/package.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index 8db964b251448..0bd4238bf214c 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -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 { |