diff options
| author | PedroHLC ☭ <root@pedrohlc.com> | 2022-09-05 19:21:42 -0300 |
|---|---|---|
| committer | PedroHLC ☭ <root@pedrohlc.com> | 2022-09-18 12:01:52 -0300 |
| commit | 6bcea10f5830f0c9377c565fe4e9cb1d9d16563f (patch) | |
| tree | 1c6c70074cc0c94d7aa471f4183ba516612a517b /pkgs/development/libraries/SDL2 | |
| parent | d5cae016d9ed22d00ec282e4901e7fa30d66706a (diff) | |
| download | nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar.gz nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar.bz2 nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar.lz nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar.xz nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.tar.zst nixpkgs-6bcea10f5830f0c9377c565fe4e9cb1d9d16563f.zip | |
SDL2: 2.0.22 -> 2.24.0
Diffstat (limited to 'pkgs/development/libraries/SDL2')
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2/find-headers.patch | 26 |
2 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index f73c5746cb7..7fe8d631d60 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -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" ]; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch index 4792679deb1..8739da91eac 100644 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -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 - |