From f736706e72868c648575377807f06cf3bd9269a7 Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Mon, 18 May 2026 02:48:09 +0200 Subject: [PATCH 1/6] Added Nix dev flake --- flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..4bb83cc0d --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..15fbe95ec --- /dev/null +++ b/flake.nix @@ -0,0 +1,33 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = {self, nixpkgs, flake-utils, ...}: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + in { + devShells.default = pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + git + cmake + glslang + addDriverRunpath + ]; + buildInputs = with pkgs; [ + alsa-lib + libX11 + libXcursor + libglvnd + vulkan-headers + vulkan-loader + vulkan-validation-layers + ]; + }; + }); +} From 8d36b875ca30c206f03de9360235d48cc8a7213b Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Mon, 18 May 2026 02:50:42 +0200 Subject: [PATCH 2/6] Update README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4ceb80a61..da64e0888 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,12 @@ sudo pacman -S git cmake gcc glslang vulkan-devel alsa-lib libx11 libxcursor vul sudo dnf install git cmake gcc-c++ glslang vulkan-loader-devel alsa-lib-devel libX11-devel libXcursor-devel vulkan-validation-layers-devel libglvnd-devel ``` +* NixOS +```bash +# use the dev flake +nix develop +``` + #### Compilation ```bash # 1st time build: From 8f804d2863c99176af9f32d98c867b9a62162d6e Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Tue, 19 May 2026 14:51:14 +0200 Subject: [PATCH 3/6] Moved flake to linux dir --- flake.lock => linux/flake.lock | 0 flake.nix => linux/flake.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename flake.lock => linux/flake.lock (100%) rename flake.nix => linux/flake.nix (100%) diff --git a/flake.lock b/linux/flake.lock similarity index 100% rename from flake.lock rename to linux/flake.lock diff --git a/flake.nix b/linux/flake.nix similarity index 100% rename from flake.nix rename to linux/flake.nix From 24c54deee3063b7ee69e06d5a8c2249f04a6d746 Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Tue, 19 May 2026 15:00:26 +0200 Subject: [PATCH 4/6] Added flake folder --- linux/{ => flake}/flake.lock | 0 linux/{ => flake}/flake.nix | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename linux/{ => flake}/flake.lock (100%) rename linux/{ => flake}/flake.nix (100%) diff --git a/linux/flake.lock b/linux/flake/flake.lock similarity index 100% rename from linux/flake.lock rename to linux/flake/flake.lock diff --git a/linux/flake.nix b/linux/flake/flake.nix similarity index 100% rename from linux/flake.nix rename to linux/flake/flake.nix From 51cd68aea4045c3a2109a6c6611c0492887ae193 Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Tue, 19 May 2026 15:04:55 +0200 Subject: [PATCH 5/6] Update README to mention the dirs --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index da64e0888..b42eb345e 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ sudo dnf install git cmake gcc-c++ glslang vulkan-loader-devel alsa-lib-devel li * NixOS ```bash # use the dev flake +cd linux/flake nix develop ``` From add362ea93ba52ee7fd1bda01de481bc20d2493f Mon Sep 17 00:00:00 2001 From: pancakedevourer Date: Thu, 21 May 2026 21:04:44 +0200 Subject: [PATCH 6/6] Removed libglvnd --- linux/flake/flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/linux/flake/flake.nix b/linux/flake/flake.nix index 15fbe95ec..826881145 100644 --- a/linux/flake/flake.nix +++ b/linux/flake/flake.nix @@ -23,7 +23,6 @@ alsa-lib libX11 libXcursor - libglvnd vulkan-headers vulkan-loader vulkan-validation-layers