From ecd3f46f7214ed3f7b27081e61db63a163ba0d13 Mon Sep 17 00:00:00 2001 From: reo101 Date: Wed, 6 May 2026 23:47:32 +0300 Subject: [PATCH 1/3] raylib: 5.5-unstable-2026-01-20 -> 6.0 --- pkgs/by-name/ra/raylib/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix index 5fee6c4498df..7bb97094f440 100644 --- a/pkgs/by-name/ra/raylib/package.nix +++ b/pkgs/by-name/ra/raylib/package.nix @@ -11,11 +11,13 @@ raylib-games, libGLU, libx11, + libxrandr, platform ? "Desktop", # Note that "Web", "Android" and "Raspberry Pi" do not currently work pulseSupport ? stdenv.hostPlatform.isLinux, alsaSupport ? false, sharedLib ? true, includeEverything ? true, + customFrameControlSupport ? false, }: let inherit (lib) optional; @@ -36,13 +38,13 @@ lib.checkListOfEnum "raylib: platform" __structuredAttrs = true; pname = "raylib"; - version = "5.5-unstable-2026-01-20"; + version = "6.0"; src = fetchFromGitHub { owner = "raysan5"; repo = "raylib"; - rev = "c610d228a244f930ad53492604640f39584c66da"; - hash = "sha256-7Lhgqb7QJwz94M1ZxWgueTwIgSVclGCvHklZXGzoJgQ="; + rev = finalAttrs.version; + hash = "sha256-8+6MDTMc7Spix4ndAUzp51Q5iWcl7pQmyXuV2RutnOk="; }; # autoPatchelfHook is needed for appendRunpaths @@ -56,11 +58,17 @@ lib.checkListOfEnum "raylib: platform" propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libGLU libx11 + libxrandr ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DCUSTOMIZE_BUILD=ON" + # The above also enables `SUPPORT_CUSTOM_FRAME_CONTROL` (otherwise off) + # That skips `SwapScreenBuffer` and `PollInputEvents` from `EndDrawing` + # In turn, normal `raylib-games` demos start but never present a window + # Keep the default game loop behavior unless explicitly requested + (lib.cmakeBool "SUPPORT_CUSTOM_FRAME_CONTROL" customFrameControlSupport) "-DPLATFORM=${platform}" ] ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON" From 39c6385b1db711ed9fc3a7cd5ca412235ec60dca Mon Sep 17 00:00:00 2001 From: reo101 Date: Tue, 26 May 2026 12:39:47 +0300 Subject: [PATCH 2/3] raylib: refactor - Make use of `lib.cmake{Bool,Feature}` for creating the CMake flags --- pkgs/by-name/ra/raylib/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ra/raylib/package.nix b/pkgs/by-name/ra/raylib/package.nix index 7bb97094f440..69de9e052379 100644 --- a/pkgs/by-name/ra/raylib/package.nix +++ b/pkgs/by-name/ra/raylib/package.nix @@ -63,17 +63,17 @@ lib.checkListOfEnum "raylib: platform" # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ - "-DCUSTOMIZE_BUILD=ON" + (lib.cmakeBool "CUSTOMIZE_BUILD" true) # The above also enables `SUPPORT_CUSTOM_FRAME_CONTROL` (otherwise off) # That skips `SwapScreenBuffer` and `PollInputEvents` from `EndDrawing` # In turn, normal `raylib-games` demos start but never present a window # Keep the default game loop behavior unless explicitly requested (lib.cmakeBool "SUPPORT_CUSTOM_FRAME_CONTROL" customFrameControlSupport) - "-DPLATFORM=${platform}" + (lib.cmakeFeature "PLATFORM" platform) ] - ++ optional (platform == "Desktop") "-DUSE_EXTERNAL_GLFW=ON" - ++ optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + ++ optional (platform == "Desktop") (lib.cmakeFeature "USE_EXTERNAL_GLFW" "ON") + ++ optional includeEverything (lib.cmakeBool "INCLUDE_EVERYTHING" true) + ++ optional sharedLib (lib.cmakeBool "BUILD_SHARED_LIBS" true); appendRunpaths = optional stdenv.hostPlatform.isLinux ( lib.makeLibraryPath (optional alsaSupport alsa-lib ++ optional pulseSupport libpulseaudio) From 8267aca00f0b1597a024e6b239093a70ecd6b45a Mon Sep 17 00:00:00 2001 From: reo101 Date: Thu, 7 May 2026 14:01:36 +0300 Subject: [PATCH 3/3] raylib-games: 2022-10-24 -> 2026-05-07 --- pkgs/by-name/ra/raylib-games/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raylib-games/package.nix b/pkgs/by-name/ra/raylib-games/package.nix index 8f4c6a144360..ae24ae776976 100644 --- a/pkgs/by-name/ra/raylib-games/package.nix +++ b/pkgs/by-name/ra/raylib-games/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "raylib-games"; - version = "2022-10-24"; + version = "2026-05-07"; src = fetchFromGitHub { owner = "raysan5"; repo = "raylib-games"; - rev = "e00d77cf96ba63472e8316ae95a23c624045dcbe"; - hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; + rev = "2175f1fe857aa91a749b66482359545f28cc596f"; + hash = "sha256-gmCbBcS5tlq6jySvDPUqZz4ONyDkSeUdgAd20c5sUls="; }; buildInputs = [ raylib ];