Merge master into staging-next

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index b25fd269d968b..c2655a6a380f3 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -5,6 +5,7 @@
 , pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio
 , sharedLib ? true
 , includeEverything ? true
+, raylib-games
 }:
 
 stdenv.mkDerivation rec {
@@ -19,10 +20,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
-    mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama
+    mesa glfw libXi libXcursor libXrandr libXinerama
   ] ++ lib.optional alsaSupport alsa-lib
     ++ lib.optional pulseSupport libpulseaudio;
+  propagatedBuildInputs = [ libGLU libX11 ];
 
   patches = [
     # fixes glfw compile error;
@@ -48,6 +51,8 @@ stdenv.mkDerivation rec {
     ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}
   '';
 
+  passthru.tests = [ raylib-games ];
+
   meta = with lib; {
     description = "A simple and easy-to-use library to enjoy videogames programming";
     homepage = "https://www.raylib.com/";