public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-install: Don't pass --show-trace by default

Browse Source
This commit is contained in:
Eelco Dolstra 2014-05-08 21:04:58 +02:00
parent 4b7c606589
commit e0e656ef46
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/installer/tools/nixos-install.sh
View File

@ -18,6 +18,9 @@ while [ "$#" -gt 0 ]; do
absolute_path=$(readlink -m $given_path) absolute_path=$(readlink -m $given_path)
extraBuildFlags+=("$i" "/mnt$absolute_path") extraBuildFlags+=("$i" "/mnt$absolute_path")
;; ;;
--show-trace)
extraBuildFlags+=("$i")
;;
--help) --help)
exec man nixos-install exec man nixos-install
exit 1 exit 1
@ -198,7 +201,7 @@ mount --bind $(readlink -f $(nix-instantiate --find-file nixpkgs)) $mountPoint/m
echo "building the system configuration..." echo "building the system configuration..."
NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixpkgs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \ NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixpkgs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
chroot $mountPoint @nix@/bin/nix-env \ chroot $mountPoint @nix@/bin/nix-env \
"${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
# Copy the NixOS/Nixpkgs sources to the target as the initial contents # Copy the NixOS/Nixpkgs sources to the target as the initial contents