42_adjoly/cub3d
1
0
Fork 0
Code

「🔨」 fix(Flake): Now working 👍

Browse Source
This commit is contained in:
Adam JOLY
2024-10-19 13:18:12 +02:00
parent fa72a134a0
commit 1697dfa7a3
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MacroLibX

Submodule MacroLibX updated: 4d640ed70c...226430f01e

2
Makefile
View File

@ -6,7 +6,7 @@
# By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ # # By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/07 16:02:18 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 #
# # # #
# **************************************************************************** # # **************************************************************************** #

8
flake.lock generated
View File

@ -20,16 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1729256560,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

9
flake.nix
View File

@ -1,7 +1,7 @@
{ {
description = "A Nix-flake-based C/C++ development environment"; description = "A Nix-flake-based C/C++ development environment";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
@ -13,10 +13,11 @@
devShells = ({ devShells = ({
default = pkgs.mkShell.override default = pkgs.mkShell.override
{ {
# For stdenv
} }
{ {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
gcc
clang
SDL2 SDL2
vulkan-loader vulkan-loader
]; ];
@ -24,8 +25,8 @@
LD_LIBRARY_PATH="${pkgs.vulkan-loader}/lib"; LD_LIBRARY_PATH="${pkgs.vulkan-loader}/lib";
packages = with pkgs; [ packages = with pkgs; [
clang_12 clang
gcc11 gcc
gdb gdb
norminette norminette
valgrind valgrind