colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL2: 2.0.22 -> 2.24.0

Browse Source
This commit is contained in:
PedroHLC ☭ 2022-09-05 19:21:42 -03:00
parent d5cae016d9
commit 6bcea10f58
No known key found for this signature in database
GPG Key ID: DF4C6898CBDC6DF5
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -59,11 +59,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "SDL2";
version = "2.0.22";
version = "2.24.0";
src = fetchurl {
url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
sha256 = "sha256-/ny/MSeILj/HJZp1oMtYViAnLFF0XThSq53YeWBpfy4=";
sha256 = "sha256-keTDSxdo+S05mweOFxRIxq8Yyv2nQ5h+0gZKKJVNbZc=";
};
dontDisableStatic = withStatic;
outputs = [ "out" "dev" ];

26
pkgs/development/libraries/SDL2/find-headers.patch
View File

@ -1,22 +1,23 @@
diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in
index c570511fa..ca694f595 100644
index db864aab9..b94e16043 100644
--- a/sdl2-config.cmake.in
+++ b/sdl2-config.cmake.in
@@ -7,7 +7,8 @@ set(includedir "@includedir@")
set(SDL2_PREFIX "${prefix}")
set(SDL2_EXEC_PREFIX "${exec_prefix}")
set(SDL2_LIBDIR "${libdir}")
-set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")
+set(SDL2_INCLUDE_DIRS "${includedir}/SDL2" $ENV{SDL2_PATH})
@@ -26,7 +26,9 @@ set_and_check(SDL2_EXEC_PREFIX "${exec_prefix}")
set_and_check(SDL2_BINDIR "${bindir}")
set_and_check(SDL2_INCLUDE_DIR "${includedir}/SDL2")
set_and_check(SDL2_LIBDIR "${libdir}")
-set(SDL2_INCLUDE_DIRS "${includedir};${SDL2_INCLUDE_DIR}")
+
+set(SDL2_INCLUDE_DIRS "${includedir};${SDL2_INCLUDE_DIR}" $ENV{SDL2_PATH})
+separate_arguments(SDL2_INCLUDE_DIRS)
set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
set(SDL2_LIBRARIES SDL2::SDL2)
set(SDL2_STATIC_LIBRARIES SDL2::SDL2-static)
diff --git a/sdl2-config.in b/sdl2-config.in
index 5a2aed292..7c55f0a28 100644
index f6eca7668..c0cd94590 100644
--- a/sdl2-config.in
+++ b/sdl2-config.in
@@ -42,7 +42,11 @@ while test $# -gt 0; do
@@ -46,7 +46,11 @@ while test $# -gt 0; do
echo @SDL_VERSION@
;;
--cflags)
@ -29,6 +30,3 @@ index 5a2aed292..7c55f0a28 100644
;;
@ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
--
2.33.1