[bin-wrappers] Don't use wrappers on run

internal/boxcli/run.go

@@ -98,10 +98,11 @@ func runScriptCmd(cmd *cobra.Command, args []string, flags runCmdFlags) error {
 	}
 	// Check the directory exists.
 	box, err := devbox.Open(&devopt.Opts{
-		Dir:    path,
-		Writer: cmd.ErrOrStderr(),
-		Pure:   flags.pure,
-		Env:    env,
+		Dir:                     path,
+		Writer:                  cmd.ErrOrStderr(),
+		Pure:                    flags.pure,
+		Env:                     env,
+		OmitBinWrappersFromPath: true,
 	})
 	if err != nil {
 		return redact.Errorf("error reading devbox.json: %w", err)

internal/impl/devbox.go

@@ -61,6 +61,7 @@ type Devbox struct {
 	pure                     bool
 	allowInsecureAdds        bool
 	customProcessComposeFile string
+	OmitBinWrappersFromPath  bool
 
 	// Possible TODO: hardcode this to stderr. Allowing the caller to specify the
 	// writer is error prone. Since it is almost always stderr, we should default
@@ -93,6 +94,7 @@ func Open(opts *devopt.Opts) (*Devbox, error) {
 		pure:                     opts.Pure,
 		customProcessComposeFile: opts.CustomProcessComposeFile,
 		allowInsecureAdds:        opts.AllowInsecureAdds,
+		OmitBinWrappersFromPath:  opts.OmitBinWrappersFromPath,
 	}
 
 	lock, err := lock.GetFile(box)
@@ -848,21 +850,17 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
 	addEnvIfNotPreviouslySetByDevbox(env, pluginEnv)
 
 	env["PATH"] = JoinPathLists(
-		// Prepend the bin-wrappers directory to the PATH. This ensures that
-		// bin-wrappers execute before the unwrapped binaries.
-		filepath.Join(d.projectDir, plugin.WrapperBinPath),
-		// Adding profile bin path is a temporary hack. Some packages .e.g. curl
-		// don't export the correct bin in the package, instead they export
-		// as a propagated build input. This can be fixed in 2 ways:
-		// * have NixBins() recursively look for bins in propagated build inputs
-		// * Turn existing planners into flakes (i.e. php, haskell) and use the bins
-		// in the profile.
-		// Landau: I prefer option 2 because it doesn't require us to re-implement
-		// nix recursive bin lookup.
 		nix.ProfileBinPath(d.projectDir),
 		env["PATH"],
 	)
 
+	if !d.OmitBinWrappersFromPath {
+		env["PATH"] = JoinPathLists(
+			filepath.Join(d.projectDir, plugin.WrapperBinPath),
+			env["PATH"],
+		)
+	}
+
 	// Include env variables in devbox.json
 	configEnv := d.configEnvs(env)
 	addEnvIfNotPreviouslySetByDevbox(env, configEnv)

internal/impl/devopt/devboxopts.go

@@ -11,6 +11,7 @@ type Opts struct {
 	Pure                     bool
 	IgnoreWarnings           bool
 	CustomProcessComposeFile string
+	OmitBinWrappersFromPath  bool
 	Writer                   io.Writer
 }