magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use nix-output-monitor if available

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-05-01 22:48:30 -04:00 • committed by June
parent 13f1274c35
commit 365c85ad27
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/complement
View file

@ -18,7 +18,12 @@ RESULTS_FILE="$3"
OCI_IMAGE="complement-conduit:dev" OCI_IMAGE="complement-conduit:dev"
pushd "$(git rev-parse --show-toplevel)" > /dev/null pushd "$(git rev-parse --show-toplevel)" > /dev/null
nix build .#complement # uses nix-output-monitor (nom) if available
if command -v nom &> /dev/null; then
nom build .#complement
else
nix build -L .#complement
fi
docker load < result docker load < result
popd > /dev/null popd > /dev/null

5
bin/nix-build-and-cache
View file

@ -6,7 +6,12 @@ set -eo pipefail
INSTALLABLE="$1" INSTALLABLE="$1"
# Build the installable and forward any other arguments too # Build the installable and forward any other arguments too
# uses nix-output-monitor (nom) if available
if command -v nom &> /dev/null; then
nom build "$@"
else
nix build -L "$@" nix build -L "$@"
fi
if [ ! -z "$ATTIC_TOKEN" ]; then if [ ! -z "$ATTIC_TOKEN" ]; then
nix run --inputs-from . attic -- \ nix run --inputs-from . attic -- \