diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-06 00:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-06 00:02:21 +0000 |
| commit | c90f3611dc081347f996b5021d6751c9e3981cf1 (patch) | |
| tree | 98d0c81e63993078baa6db793707ca007a18cfb7 /pkgs/games | |
| parent | f1403dc228559405f6a6533c1fbec56c5336b389 (diff) | |
| parent | 97bd658852ce0efbdc4d9ca84ad466a4cbfb1cf4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/doom-ports/doomrunner/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/super-tux-kart/default.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/games/doom-ports/doomrunner/default.nix b/pkgs/games/doom-ports/doomrunner/default.nix index fc715145332dd..3c1e574ca5b1d 100644 --- a/pkgs/games/doom-ports/doomrunner/default.nix +++ b/pkgs/games/doom-ports/doomrunner/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomrunner"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "Youda008"; repo = "DoomRunner"; rev = "v${finalAttrs.version}"; - hash = "sha256-twiykuUhp4+TMgUhezgelldJBbtlqA32Ah3DalFsvPo="; + hash = "sha256-mUtUXDcQXs5zTh9Msb3dXFicIsfbZpE9M8OPqtajDhw="; }; buildInputs = [ qtbase ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index b20d00a8da4e4..d92f01cad37ae 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -23,6 +23,7 @@ , sqlite , Cocoa , IOKit +, IOBluetooth , libsamplerate , shaderc }: @@ -111,7 +112,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder ++ lib.optional stdenv.hostPlatform.isLinux openal - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa libsamplerate ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa IOBluetooth libsamplerate ]; cmakeFlags = [ "-DBUILD_RECORDER=${if (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) then "ON" else "OFF"}" |