Merge branches 'gcurtis/packagefs' and 'gcurtis/patchpkg-lookpath' into gcurtis/go-patchelf

Author: gcurtis

internal/patchpkg/builder.go

@@ -78,8 +78,7 @@ func (d *DerivationBuilder) build(ctx context.Context, pkg, out *packageFS) erro
 		}
 	}
 
-	bash := filepath.Join(os.Getenv("bash"), "bin/bash")
-	cmd := exec.CommandContext(ctx, bash, "-s")
+	cmd := exec.CommandContext(ctx, lookPath("bash"), "-s")
 	cmd.Stdin = bytes.NewReader(glibcPatchScript)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -192,5 +191,24 @@ func allFiles(fsys fs.FS, root string) iter.Seq2[string, fs.DirEntry] {
 	}
 }
 
+// lookPath is like [exec.lookPath], but first checks if there's an environment
+// variable with the name prog. If there is, it returns $prog/bin/prog instead
+// of consulting PATH.
+//
+// For example, lookPath would be able to find bash and patchelf in the
+// following derivation:
+//
+//	derivation {
+//	  inherit (nixpkgs.legacyPackages.x86_64-linux) bash patchelf;
+//	  builder = devbox;
+//	}
+func lookPath(prog string) string {
+	pkgPath := os.Getenv(prog)
+	if pkgPath == "" {
+		return prog
+	}
+	return filepath.Join(pkgPath, "bin", prog)
+}
+
 func isExecutable(mode fs.FileMode) bool { return mode&0o111 != 0 }
 func isSymlink(mode fs.FileMode) bool    { return mode&fs.ModeSymlink != 0 }