From 812f3c80cc898b2993a3c9b877072ad2603240b5 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 18 Oct 2025 21:24:33 +0800 Subject: [PATCH] chore: Refactor helix package --- pkgs/helix/package.nix | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/helix/package.nix b/pkgs/helix/package.nix index a879608..2210f36 100644 --- a/pkgs/helix/package.nix +++ b/pkgs/helix/package.nix @@ -2,34 +2,34 @@ inputs, system, callPackage, - symlinkJoin, - makeWrapper, + buildEnv, lib, }: let inherit (inputs.helix.packages."${system}") helix; - helixWithPassthru = helix // { - passthru = helix.passthru // { - languages = lib.pipe "${helix.src}/languages.toml" [ - builtins.readFile - builtins.fromTOML - ]; - }; - }; runtime = callPackage ./runtime.nix { }; + helix' = helix.overrideAttrs ( + _final: prev: + let + helix-runtime = buildEnv { + name = "helix-runtime"; + paths = [ + runtime + prev.env.HELIX_DEFAULT_RUNTIME + ]; + }; + in + { + env.HELIX_DEFAULT_RUNTIME = toString helix-runtime; + } + ); in -symlinkJoin { - name = "helix-wrapped"; - paths = [ helixWithPassthru ]; - inherit (helixWithPassthru) meta; - buildInputs = [ - makeWrapper - ]; - postBuild = '' - wrapProgram $out/bin/hx \ - --set HELIX_RUNTIME ${runtime} - ''; - passthru = helixWithPassthru.passthru // { - helix-unwrapped = helixWithPassthru; +helix' +// { + passthru = (helix'.passthru or { }) // { + languages = lib.pipe "${helix.src}/languages.toml" [ + builtins.readFile + builtins.fromTOML + ]; }; }