diff --git a/external/sdl_image/CMakeLists.txt b/external/sdl_image/CMakeLists.txt index f749b18b..8a6c406c 100644 --- a/external/sdl_image/CMakeLists.txt +++ b/external/sdl_image/CMakeLists.txt @@ -17,7 +17,8 @@ if (NOT TARGET SDL3_image::SDL3_image) # waiting on the imgui pr to get merged so i can update sdl <.< #GIT_TAG a45d6e5b84ccc0f3faae6ba7d561709ed600eee7 # tip last check #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 ) FetchContent_MakeAvailable(SDL3_image) diff --git a/flake.lock b/flake.lock index 5139225d..0dee75d9 100644 --- a/flake.lock +++ b/flake.lock @@ -80,17 +80,17 @@ "sdl3_image": { "flake": false, "locked": { - "lastModified": 1716394356, - "narHash": "sha256-dQ4x7ZbQodOs4PQU90evoa870abC/u0uaVLEqU1nB8k=", + "lastModified": 1717528558, + "narHash": "sha256-VS5GMxcJgmghmck1FoGJmrt94ubtBr9eGQUmYEMoUZQ=", "owner": "libsdl-org", "repo": "SDL_image", - "rev": "2fc5310a9a2700fc856663200f94edebeb5e554a", + "rev": "8eff782fa33d795c9ea1ac42dbe7e17cc9874c78", "type": "github" }, "original": { "owner": "libsdl-org", "repo": "SDL_image", - "rev": "2fc5310a9a2700fc856663200f94edebeb5e554a", + "rev": "8eff782fa33d795c9ea1ac42dbe7e17cc9874c78", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 45bd1a2f..ac69efc8 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; + #nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; flake-utils.url = "github:numtide/flake-utils"; nlohmann-json = { url = "github:nlohmann/json/v3.11.3"; # TODO: read version from file @@ -15,7 +16,7 @@ flake = false; }; sdl3_image = { - url = "github:libsdl-org/SDL_image/2fc5310a9a2700fc856663200f94edebeb5e554a"; + url = "github:libsdl-org/SDL_image/8eff782fa33d795c9ea1ac42dbe7e17cc9874c78"; flake = false; }; }; @@ -25,6 +26,7 @@ let pkgs = import nixpkgs { inherit system; }; stdenv = (pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv); + #stdenv = (pkgs.stdenvAdapters.withCFlags [ "-march=x86-64-v3" ] (pkgs.stdenvAdapters.keepDebugInfo pkgs.stdenv)); in { #packages.default = pkgs.stdenv.mkDerivation { packages.default = stdenv.mkDerivation {