Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

update sdl_image

Browse Source
This commit is contained in:
Green Sky 2024-06-09 09:11:39 +02:00
parent 9b163e00d9
commit 1111a11577
No known key found for this signature in database
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/sdl_image/CMakeLists.txt vendored
View File

@ -17,7 +17,8 @@ if (NOT TARGET SDL3_image::SDL3_image)
# waiting on the imgui pr to get merged so i can update sdl <.< # waiting on the imgui pr to get merged so i can update sdl <.<
#GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check #GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check
#GIT_TAG a34ccf16f961e6d5a480045eb650fc3dddb4bfaa # tip 14-05-2024 #GIT_TAG a34ccf16f961e6d5a480045eb650fc3dddb4bfaa # tip 14-05-2024
GIT_TAG 2fc5310a9a2700fc856663200f94edebeb5e554a # tip 28-05-2024 #GIT_TAG 2fc5310a9a2700fc856663200f94edebeb5e554a # tip 28-05-2024
GIT_TAG 8eff782fa33d795c9ea1ac42dbe7e17cc9874c78 # tip 09-06-2024
FIND_PACKAGE_ARGS # for the future FIND_PACKAGE_ARGS # for the future
) )
FetchContent_MakeAvailable(SDL3_image) FetchContent_MakeAvailable(SDL3_image)

8
flake.lock generated
View File

@ -80,17 +80,17 @@
"sdl3_image": { "sdl3_image": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716394356, "lastModified": 1717528558,
"narHash": "sha256-dQ4x7ZbQodOs4PQU90evoa870abC/u0uaVLEqU1nB8k=", "narHash": "sha256-VS5GMxcJgmghmck1FoGJmrt94ubtBr9eGQUmYEMoUZQ=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "2fc5310a9a2700fc856663200f94edebeb5e554a", "rev": "8eff782fa33d795c9ea1ac42dbe7e17cc9874c78",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "2fc5310a9a2700fc856663200f94edebeb5e554a", "rev": "8eff782fa33d795c9ea1ac42dbe7e17cc9874c78",
"type": "github" "type": "github"
} }
}, },

4
flake.nix
View File

@ -5,6 +5,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
#nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
nlohmann-json = { nlohmann-json = {
url = "github:nlohmann/json/v3.11.3"; # TODO: read version from file url = "github:nlohmann/json/v3.11.3"; # TODO: read version from file
@ -15,7 +16,7 @@
flake = false; flake = false;
}; };
sdl3_image = { sdl3_image = {
url = "github:libsdl-org/SDL_image/2fc5310a9a2700fc856663200f94edebeb5e554a"; url = "github:libsdl-org/SDL_image/8eff782fa33d795c9ea1ac42dbe7e17cc9874c78";
flake = false; flake = false;
}; };
}; };
@ -25,6 +26,7 @@
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
stdenv = (pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv); stdenv = (pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv);
#stdenv = (pkgs.stdenvAdapters.withCFlags [ "-march=x86-64-v3" ] (pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv));
in { in {
#packages.default = pkgs.stdenv.mkDerivation { #packages.default = pkgs.stdenv.mkDerivation {
packages.default = stdenv.mkDerivation { packages.default = stdenv.mkDerivation {