diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index bf65cec96980..881f4036eb26 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -14,7 +14,6 @@ rustc, versionCheckHook, nix-update-script, - tsgolint, }: # Build with pnpm instead of buildRustPackage because Prettier integration @@ -90,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { cp npm/oxfmt/configuration_schema.json $outPath/ makeWrapper ${lib.getExe nodejs-slim} $out/bin/oxfmt \ - --prefix PATH : "${lib.makeBinPath [ tsgolint ]}" \ --add-flags $outPath/dist/cli.js runHook postInstall diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 2f867f9ee287..1167bf7d00de 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -3,8 +3,10 @@ rustPlatform, fetchFromGitHub, cmake, + makeBinaryWrapper, nix-update-script, rust-jemalloc-sys, + tsgolint, versionCheckHook, }: @@ -21,7 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo="; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + makeBinaryWrapper + ]; buildInputs = [ rust-jemalloc-sys ]; @@ -33,6 +38,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; cargoTestFlags = finalAttrs.cargoBuildFlags; + postFixup = '' + wrapProgram $out/bin/oxlint \ + --prefix PATH : "${lib.makeBinPath [ tsgolint ]}" + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true;