daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-02-23 07:55:50 -06:00
Code Issues Projects Releases Packages Wiki Activity

if print-build-logs then print the build logs

Browse source
This commit is contained in:
Daylin Morgan 2025-02-11 13:56:27 -06:00
parent 00c648780d
commit e94bd64891
Signed by: daylin
GPG key ID: 950D13E9719334AD
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/oizys/src/oizys/nix.nim
View file

@ -316,11 +316,6 @@ type
BuildResult = object BuildResult = object
duration*: Duration duration*: Duration
successful*: bool successful*: bool
stdout*: string
stderr*: string
proc show(br: BuildResult) =
error "\n" & formatStdoutStderr(br.stdout, br.stderr)
func formatDuration(d: Duration): string = func formatDuration(d: Duration): string =
## convert duration to: X minutes and Y seconds ## convert duration to: X minutes and Y seconds
@ -336,16 +331,22 @@ proc build(path: string, drv: NixDerivation, rest: seq[string]): BuildResult =
var cmd = "nix build" var cmd = "nix build"
cmd.addArgs path & "^*", "--no-link" cmd.addArgs path & "^*", "--no-link"
cmd.addArgs rest cmd.addArgs rest
let (stdout, stderr, buildCode) = runCmdCapt(cmd, {CaptStderr})
let (stdout, stderr, buildCode) =
if "-L" in rest or "--print-build-logs" in rest: ("","", runCmd(cmd))
else: runCmdCapt(cmd, {CaptStderr})
result.duration = now() - startTime result.duration = now() - startTime
result.stdout = stdout
result.stderr = stderr # result.stdout = stdout
# result.stderr = stderr
if buildCode == 0: if buildCode == 0:
result.successful = true result.successful = true
info "succesfully built: " & splitDrv(path).name info "succesfully built: " & splitDrv(path).name
else: else:
error "failed to build: " & splitDrv(path).name error "failed to build: " & splitDrv(path).name
show result error "\n" & formatStdoutStderr(stdout, stderr)
info "-> duration: " & formatDuration(result.duration) info "-> duration: " & formatDuration(result.duration)
func outputsPaths(drv: NixDerivation): seq[string] = func outputsPaths(drv: NixDerivation): seq[string] =