-
-
-
-
-
-
-
-
-
-## Colored badges
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+## Colored badges
+
+
+
+
diff --git a/assets/Badge.svg b/assets/Badge.svg
index babda1a..714305d 100644
--- a/assets/Badge.svg
+++ b/assets/Badge.svg
@@ -1,9 +1,9 @@
-
+
diff --git a/assets/Logo.svg b/assets/Logo.svg
index ef382b7..7730d19 100644
--- a/assets/Logo.svg
+++ b/assets/Logo.svg
@@ -1,10 +1,10 @@
-
+
diff --git a/default.nix b/default.nix
index 1ad47e5..1aa9adf 100644
--- a/default.nix
+++ b/default.nix
@@ -1,75 +1,75 @@
-{ lib,
- rustPlatform,
- nix-gitignore,
- bash,
- makeWrapper,
- dav1d,
- vulkan-loader,
- libGL,
- wayland,
- pkg-config,
- libxkbcommon,
- pkgs,
- stdenv,
- targetPackages ? pkgs,
-}: let
- version = (builtins.fromTOML (builtins.readFile ./engine/Cargo.toml)).package.version;
- src = nix-gitignore.gitignoreSource [] ./.;
-in
-rustPlatform.buildRustPackage rec {
- pname = "zenyx";
- inherit src version;
- cargoLock.lockFile = ./Cargo.lock;
-
- nativeBuildInputs = [
- pkg-config
- ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
- targetPackages.darwin.apple_sdk.frameworks.CoreServices
- ];
-
- buildInputs = with targetPackages; [
- dav1d
- ] ++ lib.optionals (stdenv.targetPlatform.isLinux || stdenv.targetPlatform.isWindows) [
- vulkan-loader
- ] ++ lib.optionals stdenv.targetPlatform.isLinux [
- makeWrapper
- wayland
- libxkbcommon
- libGL
- xorg.libXcursor
- xorg.libXrandr
- xorg.libXi
- xorg.libX11
- xorg.libxcb
- bash
- ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
- makeWrapper
- darwin.apple_sdk.frameworks.Cocoa
- darwin.apple_sdk.frameworks.Metal
- darwin.apple_sdk.frameworks.CoreVideo
- darwin.apple_sdk.frameworks.QuartzCore
- ];
-
- CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER =
- lib.optionalString stdenv.targetPlatform.isWindows "${stdenv.cc.targetPrefix}gcc";
-
- NIX_LDFLAGS = lib.optionalString stdenv.targetPlatform.isDarwin "-framework CoreFoundation";
-
- postInstall = lib.optionalString stdenv.targetPlatform.isLinux ''
- wrapProgram $out/bin/${pname} \
- --prefix PATH : ${lib.makeBinPath [ bash ]} \
- --set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs}
- '' + lib.optionalString stdenv.targetPlatform.isWindows ''
- mkdir -p $out/bin
- cp ${targetPackages.vulkan-loader}/bin/vulkan-1.dll $out/bin/
- '';
-
- doCheck = false;
-
- meta = {
- description = "Cross-platform WSYWIG Game Engine";
- license = lib.licenses.mit;
- platforms = lib.platforms.all;
- mainProgram = "zenyx";
- };
+{ lib,
+ rustPlatform,
+ nix-gitignore,
+ bash,
+ makeWrapper,
+ dav1d,
+ vulkan-loader,
+ libGL,
+ wayland,
+ pkg-config,
+ libxkbcommon,
+ pkgs,
+ stdenv,
+ targetPackages ? pkgs,
+}: let
+ version = (builtins.fromTOML (builtins.readFile ./engine/Cargo.toml)).package.version;
+ src = nix-gitignore.gitignoreSource [] ./.;
+in
+rustPlatform.buildRustPackage rec {
+ pname = "zenyx";
+ inherit src version;
+ cargoLock.lockFile = ./Cargo.lock;
+
+ nativeBuildInputs = [
+ pkg-config
+ ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
+ targetPackages.darwin.apple_sdk.frameworks.CoreServices
+ ];
+
+ buildInputs = with targetPackages; [
+ dav1d
+ ] ++ lib.optionals (stdenv.targetPlatform.isLinux || stdenv.targetPlatform.isWindows) [
+ vulkan-loader
+ ] ++ lib.optionals stdenv.targetPlatform.isLinux [
+ makeWrapper
+ wayland
+ libxkbcommon
+ libGL
+ xorg.libXcursor
+ xorg.libXrandr
+ xorg.libXi
+ xorg.libX11
+ xorg.libxcb
+ bash
+ ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
+ makeWrapper
+ darwin.apple_sdk.frameworks.Cocoa
+ darwin.apple_sdk.frameworks.Metal
+ darwin.apple_sdk.frameworks.CoreVideo
+ darwin.apple_sdk.frameworks.QuartzCore
+ ];
+
+ CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER =
+ lib.optionalString stdenv.targetPlatform.isWindows "${stdenv.cc.targetPrefix}gcc";
+
+ NIX_LDFLAGS = lib.optionalString stdenv.targetPlatform.isDarwin "-framework CoreFoundation";
+
+ postInstall = lib.optionalString stdenv.targetPlatform.isLinux ''
+ wrapProgram $out/bin/${pname} \
+ --prefix PATH : ${lib.makeBinPath [ bash ]} \
+ --set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs}
+ '' + lib.optionalString stdenv.targetPlatform.isWindows ''
+ mkdir -p $out/bin
+ cp ${targetPackages.vulkan-loader}/bin/vulkan-1.dll $out/bin/
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "Cross-platform WSYWIG Game Engine";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.all;
+ mainProgram = "zenyx";
+ };
}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 1c67c8f..61da03c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,190 +1,190 @@
-{
- "nodes": {
- "alejandra": {
- "inputs": {
- "fenix": "fenix",
- "flakeCompat": "flakeCompat",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1730688725,
- "narHash": "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=",
- "owner": "kamadorueda",
- "repo": "alejandra",
- "rev": "2bb91e309ca99656addff5c74545acbf5813636d",
- "type": "github"
- },
- "original": {
- "owner": "kamadorueda",
- "ref": "3.1.0",
- "repo": "alejandra",
- "type": "github"
- }
- },
- "fenix": {
- "inputs": {
- "nixpkgs": [
- "alejandra",
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src"
- },
- "locked": {
- "lastModified": 1730615655,
- "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "fenix",
- "type": "github"
- }
- },
- "flake-compat": {
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "revCount": 69,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
- }
- },
- "flakeCompat": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1743095683,
- "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1736320768,
- "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "alejandra": "alejandra",
- "flake-compat": "flake-compat",
- "nixpkgs": "nixpkgs",
- "rust-overlay": "rust-overlay",
- "utils": "utils"
- }
- },
- "rust-analyzer-src": {
- "flake": false,
- "locked": {
- "lastModified": 1730555913,
- "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
- "rust-overlay": {
- "inputs": {
- "nixpkgs": "nixpkgs_2"
- },
- "locked": {
- "lastModified": 1743215516,
- "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "524463199fdee49338006b049bc376b965a2cfed",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "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"
- }
- }
- },
- "root": "root",
- "version": 7
-}
+{
+ "nodes": {
+ "alejandra": {
+ "inputs": {
+ "fenix": "fenix",
+ "flakeCompat": "flakeCompat",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1730688725,
+ "narHash": "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A=",
+ "owner": "kamadorueda",
+ "repo": "alejandra",
+ "rev": "2bb91e309ca99656addff5c74545acbf5813636d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "kamadorueda",
+ "ref": "3.1.0",
+ "repo": "alejandra",
+ "type": "github"
+ }
+ },
+ "fenix": {
+ "inputs": {
+ "nixpkgs": [
+ "alejandra",
+ "nixpkgs"
+ ],
+ "rust-analyzer-src": "rust-analyzer-src"
+ },
+ "locked": {
+ "lastModified": 1730615655,
+ "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
+ "owner": "nix-community",
+ "repo": "fenix",
+ "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "fenix",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "revCount": 69,
+ "type": "tarball",
+ "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+ }
+ },
+ "flakeCompat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1743095683,
+ "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1736320768,
+ "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "alejandra": "alejandra",
+ "flake-compat": "flake-compat",
+ "nixpkgs": "nixpkgs",
+ "rust-overlay": "rust-overlay",
+ "utils": "utils"
+ }
+ },
+ "rust-analyzer-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1730555913,
+ "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
+ "owner": "rust-lang",
+ "repo": "rust-analyzer",
+ "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "rust-lang",
+ "ref": "nightly",
+ "repo": "rust-analyzer",
+ "type": "github"
+ }
+ },
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1743215516,
+ "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "524463199fdee49338006b049bc376b965a2cfed",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "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"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 2b71e5f..65256e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,78 +1,84 @@
-{
- description = "Zenyx - A WSYWIG game engine written in rust ";
- inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- utils.url = "github:numtide/flake-utils";
- rust-overlay.url = "github:oxalica/rust-overlay";
- flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
- alejandra.url = "github:kamadorueda/alejandra/3.1.0";
- alejandra.inputs.nixpkgs.follows = "nixpkgs";
- };
-
- outputs = {
- self,
- nixpkgs,
- utils,
- rust-overlay,
- alejandra,
- ...
- }:
- {
- overlays.default = final: prev: {
- zenyx = final.callPackage ./default.nix {};
- };
- }
- // utils.lib.eachDefaultSystem (
- system: let
- pkgs = import nixpkgs {
- inherit system;
- overlays = [
- self.overlays.default
- (import rust-overlay)
- ];
- };
- buildInputs = with pkgs; [
- vulkan-loader
- libGL
- wayland
- libxkbcommon
- xorg.libXcursor
- xorg.libXrandr
- xorg.libXi
- xorg.libX11
- xorg.libxcb
- pkg-config
- kdePackages.kdialog
- ];
- in {
- packages = {
- inherit (pkgs) zenyx;
- default = pkgs.zenyx;
- windows = let
- pkgsCross = import nixpkgs {
- system = "x86_64-linux";
- crossSystem = nixpkgs.lib.systems.examples.mingwW64;
- };
- in pkgsCross.callPackage ./default.nix {};
- };
-
- devShells.default = pkgs.mkShell {
- name = "zenyx";
- nativeBuildInputs = with pkgs; [
- (rust-bin.stable.latest.default.override {
- extensions = ["rust-src" "cargo" "rustfmt" "clippy"];
- })
- pkg-config
- ];
- buildInputs = buildInputs;
- shellHook = ''
- export PATH="$HOME/.cargo/bin:$PATH"
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"
- echo "Rust version: $(rustc --version)"
- '';
- };
-
- formatter = alejandra.packages.${system}.default;
- }
- );
-}
+{
+ description = "Zenyx - A WSYWIG game engine written in rust ";
+ inputs = {
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ utils.url = "github:numtide/flake-utils";
+ rust-overlay.url = "github:oxalica/rust-overlay";
+ flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
+ alejandra.url = "github:kamadorueda/alejandra/3.1.0";
+ alejandra.inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ outputs = {
+ self,
+ nixpkgs,
+ utils,
+ rust-overlay,
+ alejandra,
+ ...
+ }:
+ {
+ overlays.default = final: prev: {
+ zenyx = final.callPackage ./default.nix {};
+ };
+ }
+ // utils.lib.eachDefaultSystem (
+ system: let
+ pkgs = import nixpkgs {
+ inherit system;
+ overlays = [
+ self.overlays.default
+ (import rust-overlay)
+ ];
+ };
+ buildInputs = with pkgs; [
+ vulkan-loader
+ libGL
+ wayland
+ libxkbcommon
+ xorg.libXcursor
+ xorg.libXrandr
+ xorg.libXi
+ xorg.libX11
+ xorg.libxcb
+ pkg-config
+ kdePackages.kdialog
+ cargo-xbuild
+ cargo-pgo
+ cargo-cross
+ cargo-xwin
+ cargo-wizard
+ wine64
+ ];
+ in {
+ packages = {
+ inherit (pkgs) zenyx;
+ default = pkgs.zenyx;
+ windows = let
+ pkgsCross = import nixpkgs {
+ system = "x86_64-linux";
+ crossSystem = nixpkgs.lib.systems.examples.mingwW64;
+ };
+ in pkgsCross.callPackage ./default.nix {};
+ };
+
+ devShells.default = pkgs.mkShell {
+ name = "zenyx";
+ nativeBuildInputs = with pkgs; [
+ (rust-bin.stable.latest.default.override {
+ extensions = ["rust-src" "cargo" "rustfmt" "clippy"];
+ targets = [ "x86_64-pc-windows-msvc" "x86_64-unknown-linux-gnu" ];
+
+ })
+ pkg-config
+ ];
+ buildInputs = buildInputs;
+ shellHook = ''
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"
+ echo "Rust version: $(rustc --version)"
+ '';
+ };
+ formatter = alejandra.packages.${system}.default;
+ }
+ );
+}
diff --git a/rustfmt.toml b/rustfmt.toml
index c7302df..a99bc20 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,7 +1,7 @@
-indent_style = "Block"
-wrap_comments = true
-format_code_in_doc_comments = true
-trailing_comma = "Vertical"
-group_imports = "StdExternalCrate"
-reorder_impl_items = true
-unstable_features = true
+indent_style = "Block"
+wrap_comments = true
+format_code_in_doc_comments = true
+trailing_comma = "Vertical"
+group_imports = "StdExternalCrate"
+reorder_impl_items = true
+unstable_features = true
diff --git a/shell.nix b/shell.nix
index 3899c24..64217fe 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,15 +1,15 @@
-(
- import
- (
- let
- lock = builtins.fromJSON (builtins.readFile ./flake.lock);
- nodeName = lock.nodes.root.inputs.flake-compat;
- in
- fetchTarball {
- url = lock.nodes.${nodeName}.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
- sha256 = lock.nodes.${nodeName}.locked.narHash;
- }
- )
- {src = ./.;}
-)
-.shellNix
+(
+ import
+ (
+ let
+ lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+ nodeName = lock.nodes.root.inputs.flake-compat;
+ in
+ fetchTarball {
+ url = lock.nodes.${nodeName}.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+ sha256 = lock.nodes.${nodeName}.locked.narHash;
+ }
+ )
+ {src = ./.;}
+)
+.shellNix
diff --git a/src/main.rs b/src/main.rs
index ec82a19..bc30864 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,39 +1,85 @@
+use crossbeam::channel::{Sender, unbounded};
use std::{
- fs::OpenOptions, io::{self, BufWriter, Stdout, Write}, path::{Path, PathBuf}, str::FromStr, sync::{mpsc, Arc, RwLock}
+ fmt,
+ fs::OpenOptions,
+ io::{BufWriter, Write},
+ path::{Path, PathBuf},
+ str::FromStr,
+ sync::{Arc, RwLock},
+ time::SystemTime,
+};
+use tracing::{Event, Level, Subscriber, info};
+use tracing_subscriber::{
+ EnvFilter,
+ layer::{Context, Layer, SubscriberExt},
+ registry::LookupSpan,
+ util::SubscriberInitExt,
};
-
-use tracing::{error, info};
-use tracing_subscriber::fmt::format::FmtSpan;
-use tracing_subscriber::{Layer, Registry, layer::SubscriberExt, util::SubscriberInitExt};
-use winit::event_loop::EventLoop;
#[derive(Debug, Default)]
struct App;
-struct BufferWriter {
- buffer: Arc