diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/raylib/default.nix | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/raylib/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/raylib/default.nix | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/raylib/default.nix b/nixpkgs/pkgs/development/libraries/raylib/default.nix index c2655a6a380f..5af34139f930 100644 --- a/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -8,15 +8,15 @@ , raylib-games }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "raylib"; - version = "4.2.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "raysan5"; - repo = pname; - rev = version; - sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM="; + repo = "raylib"; + rev = finalAttrs.version; + hash = "sha256-Uqqzq5shDp0AgSBT5waHBNUkEu0LRj70SNOlR5R2yAM="; }; nativeBuildInputs = [ cmake ]; @@ -27,16 +27,6 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio; propagatedBuildInputs = [ libGLU libX11 ]; - patches = [ - # fixes glfw compile error; - # remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released. - (fetchpatch { - url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch"; - sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY="; - name = "raylib-glfw-fix.patch"; - }) - ]; - # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DUSE_EXTERNAL_GLFW=ON" @@ -45,20 +35,29 @@ stdenv.mkDerivation rec { ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + passthru.tests = [ raylib-games ]; + + patches = [ + # Patch version in CMakeList to 4.5.0 + # Remove this when updating to a new revision + (fetchpatch { + url = "https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7.patch"; + hash = "sha256-RGokbQAwJAZm2FU2VNwraE3xko8E+RLLFjUfDRXeKhA="; + }) + ]; + # fix libasound.so/libpulse.so not being found preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"} - ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} + ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${finalAttrs.version}"} + ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${finalAttrs.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/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; - changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG"; + changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; -} +}) |