diff --git a/MacroLibX b/MacroLibX index 4d640ed..226430f 160000 --- a/MacroLibX +++ b/MacroLibX @@ -1 +1 @@ -Subproject commit 4d640ed70cd392f3e3311fe2779905876b7f1b6f +Subproject commit 226430f01e8a51ef0aff2e11e3791557edfea0e3 diff --git a/Makefile b/Makefile index f9ecccb..44a6bc1 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/07 16:02:18 by adjoly #+# #+# # -# Updated: 2024/10/17 01:22:00 by adjoly ### ########.fr # +# Updated: 2024/10/19 12:19:00 by adjoly ### ########.fr # # # # **************************************************************************** # diff --git a/flake.lock b/flake.lock index 3614c3e..c24abf7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 387d863..d791dcb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "A Nix-flake-based C/C++ development environment"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -13,10 +13,11 @@ devShells = ({ default = pkgs.mkShell.override { - # For stdenv } { buildInputs = with pkgs; [ + gcc + clang SDL2 vulkan-loader ]; @@ -24,8 +25,8 @@ LD_LIBRARY_PATH="${pkgs.vulkan-loader}/lib"; packages = with pkgs; [ - clang_12 - gcc11 + clang + gcc gdb norminette valgrind