cat/nixbuild
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/nix-tool: pass --store via extraArgs

Browse Source 
Sleepy me forgot about passing extraArgs :c
This commit is contained in:
Ophestra 2025-07-20 03:27:19 +09:00
parent d6d327cb91
commit 55933ccfb3
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/nix-tool/chroot.go
View File

@ -1,17 +0,0 @@
package main
import (
"context"
"os/exec"
"gensokyo.uk/nix"
)
type chrootStoreContext struct {
store string
nix.Context
}
func (c *chrootStoreContext) Nix(ctx context.Context, arg ...string) *exec.Cmd {
return c.Context.Nix(ctx, append([]string{"--store", c.store}, arg...)...)
}

13
cmd/nix-tool/main.go
View File

@ -36,16 +36,17 @@ func main() {
c := command.New(os.Stderr, log.Printf, "nix-tool", func(args []string) error {
log.SetFlags(0)
var extraArgs []string
flagStore = strings.TrimSpace(flagStore)
if flagStore != string(os.PathSeparator) {
extraArgs = append(extraArgs, "--store", flagStore)
}
var stderr io.Writer
if flagVerbose {
stderr = os.Stderr
}
ctx = nix.New(nixCtx, nil, os.Stdout, stderr)
flagStore = strings.TrimSpace(flagStore)
if flagStore != string(os.PathSeparator) {
ctx = &chrootStoreContext{flagStore, ctx}
}
ctx = nix.New(nixCtx, extraArgs, os.Stdout, stderr)
return nil
}).