Compare commits
2 commits
ebeee537a4
...
cdca8dd72a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdca8dd72a | ||
|
|
39acafd067 |
2 changed files with 4 additions and 16 deletions
16
meat.nu
16
meat.nu
|
|
@ -43,19 +43,7 @@ def nix-conf-attr []: nothing -> string {
|
|||
}
|
||||
|
||||
def nix-build-nom [out: string, source: string, attr: string, extras: list<string> = []] {
|
||||
if ($env.MONITOR? | is-empty) {
|
||||
^nix-build --out-link $out $source -A $attr ...$extras
|
||||
} else {
|
||||
^nix-build --log-format internal-json -v --out-link $out $source -A $attr ...$extras out+err>| ^$env.MONITOR --json
|
||||
}
|
||||
}
|
||||
|
||||
def differ-step [build: string] {
|
||||
if ($env.DIFFER? | is-empty) {
|
||||
meat-print " (no DIFFER set; skipping diff)"
|
||||
} else {
|
||||
^$env.DIFFER /nix/var/nix/profiles/system $build
|
||||
}
|
||||
^nix-build --log-format internal-json -v --out-link $out $source -A $attr ...$extras out+err>| ^$env.MONITOR --json
|
||||
}
|
||||
|
||||
def activate [build_path: string] {
|
||||
|
|
@ -66,7 +54,7 @@ def do-build [extras: list<string> = []] {
|
|||
let tmpdir = ^mktemp -d -t "meat-build.XXXXXX" | str trim
|
||||
let build = $"($tmpdir)/build"
|
||||
nix-build-nom $build $"($env.MEATS)/entry.nix" (system-attr) $extras
|
||||
differ-step $build
|
||||
^$env.DIFFER /nix/var/nix/profiles/system $build
|
||||
activate $build
|
||||
try { rm $build }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation {
|
|||
mkdir -p $out/bin
|
||||
makeBinaryWrapper ${nushell}/bin/nu $out/bin/meat \
|
||||
--add-flags "$out/share/meat/meat.nu" \
|
||||
--set DIFFER ${lib.getExe differ} \
|
||||
--set MONITOR ${lib.getExe monitor}
|
||||
--set DIFFER ${lib.makeBinPath [ differ ]} \
|
||||
--set MONITOR ${lib.makeBinPath [ monitor ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue