From 7b6aa2b7047001867de723df5f7162ecf5e0d41f Mon Sep 17 00:00:00 2001 From: Adam Griffiths Date: Thu, 3 Jun 2021 21:22:09 +1000 Subject: [PATCH] raylib: 3.5.0 -> 3.7.0 (#124244) * raylib: 3.5.0 -> 3.7.0 * Update pkgs/development/libraries/raylib/default.nix Co-authored-by: Sandro --- pkgs/development/libraries/raylib/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 47d8fdb040b2..16f6c324a7a9 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -3,25 +3,26 @@ libX11, libXi, libXcursor, libXrandr, libXinerama, alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, + sharedLib ? true, includeEverything ? true }: stdenv.mkDerivation rec { pname = "raylib"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "raysan5"; repo = pname; rev = version; - sha256 = "0syvd5js1lbx3g4cddwwncqg95l6hb3fdz5nsh5pqy7fr6v84kwj"; + sha256 = "1w8v747hqy0ils6zmy8sm056f24ybjhn9bamqzlxvbqhvh9vvly1"; }; patches = [ - # fixes examples not compiling in 3.5.0 + # fixes incorrect version being set by cmake (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/raysan5/raylib/pull/1470.patch"; - sha256 = "1ff5l839wl8dxwrs2bwky7kqa8kk9qmsflg31sk5vbil68dzbzg0"; + url = "https://github.com/raysan5/raylib/commit/204aa4c46fdd6986aa0130eeba658562c540759f.patch"; + sha256 = "10pl7828iy4kadach0wy4fs95vr7k08z3mxw90j8dm9xak1ri8fz"; }) ]; @@ -34,9 +35,9 @@ stdenv.mkDerivation rec { # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DUSE_EXTERNAL_GLFW=ON" - "-DSHARED=ON" "-DBUILD_EXAMPLES=OFF" - ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"; + ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" + ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; # fix libasound.so/libpulse.so not being found preFixup = ''