From d450afc911598812d54cbac7e384a2bf4724f9ce Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 18 Jan 2023 15:13:15 -0700 Subject: [PATCH] cargo-auditable-cargo-wrapper: Use writeShellScriptBin instead of writeShellApplication This is to prevent pulling in GHC for such a simple wrapper script. --- .../rust/cargo-auditable-cargo-wrapper.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index 3afa59739a37..b50097d5e66b 100644 --- a/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,12 +1,9 @@ -{ lib, writeShellApplication, cargo, cargo-auditable }: +{ lib, writeShellScriptBin, cargo, cargo-auditable }: -(writeShellApplication { - name = "cargo"; - runtimeInputs = [ cargo cargo-auditable ]; - text = '' - CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 cargo auditable "$@" - ''; -}) // { +(writeShellScriptBin "cargo" '' + export PATH="${lib.makeBinPath [ cargo cargo-auditable ]}:$PATH" + CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 exec cargo auditable "$@" +'') // { meta = cargo-auditable.meta // { mainProgram = "cargo"; };