From 886ca98838547451ea43b494efc0b4d11a0fae9a Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 15 May 2024 16:46:53 +0300 Subject: [PATCH] Fix index out of bounds and clean package.nix --- build.zig.zon.nix | 6 ------ package.nix | 29 +++++++---------------------- src/main.zig | 2 +- 3 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 build.zig.zon.nix diff --git a/build.zig.zon.nix b/build.zig.zon.nix deleted file mode 100644 index 441b465..0000000 --- a/build.zig.zon.nix +++ /dev/null @@ -1,6 +0,0 @@ -# generated by zon2nix (https://github.com/nix-community/zon2nix) - -{ linkFarm, fetchzip }: - -linkFarm "zig-packages" [ -] diff --git a/package.nix b/package.nix index e666e9a..006bc8d 100644 --- a/package.nix +++ b/package.nix @@ -1,10 +1,8 @@ { lib, stdenvNoCC, - callPackage, zig_0_12, - optimize ? "ReleaseFast", bashInteractive, fallbackShell ? bashInteractive, @@ -19,28 +17,15 @@ in stdenvNoCC.mkDerivation { src = ./.; - nativeBuildInputs = [ zig_0_12 ]; + dontCheck = true; - dontConfigure = true; - dontInstall = true; + nativeBuildInputs = [ + zig_0_12.hook + ]; - preBuild = '' - mkdir -p .cache - ln -s ${callPackage ./build.zig.zon.nix {}} .cache/p - ''; - - buildPhase = '' - runHook preBuild - - zig build install \ - --cache-dir $(pwd)/zig-cache \ - --global-cache-dir $(pwd)/.cache \ - --prefix $out \ - -Doptimize=${optimize} \ - -Dfallback_shell=${fallbackShell'} - - runHook postBuild - ''; + zigBuildFlags = [ + "-Dfallback_shell=${fallbackShell'}" + ]; passthru.shellPath = "/bin/crash"; diff --git a/src/main.zig b/src/main.zig index f68efac..8f96461 100644 --- a/src/main.zig +++ b/src/main.zig @@ -16,8 +16,8 @@ pub fn main() noreturn { var argi = std.process.args(); while (argi.next()) |arg| { - args[args.len] = arg; args.len += 1; + args[args.len - 1] = arg; } const shells = std.posix.getenv("SHELLS") orelse fallback(alloc);