nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Silence command outputs and satisfy set -u

Browse source
This commit is contained in:
Tobias Happ 2019-11-30 22:15:58 +01:00 • committed by Alexander Sosedkin
parent 0b49d57487
commit 4b0db68944
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -46,7 +46,7 @@ rec {
${pkgs.coreutils}/bin/cp ${./modules/environment/login/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.coreutils}/bin/cp ${./modules/environment/login/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix
${pkgs.coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix
if command -v home-manager && [[ -n "$HOME_MANAGER_CONFIG" && -r "$HOME_MANAGER_CONFIG" || -r "$HOME/.config/nixpkgs/home.nix" ]]; then if command -v home-manager > /dev/null && [[ -n "''${HOME_MANAGER_CONFIG:-}" && -r "$HOME_MANAGER_CONFIG" || -r "$HOME/.config/nixpkgs/home.nix" ]]; then
echo "Migrating home-manager installation..." echo "Migrating home-manager installation..."
if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@ -68,7 +68,7 @@ rec {
} }
# vim: ft=nix # vim: ft=nix
''} ''} > /dev/null
else else
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,8 @@ @@ -27,15 +27,8 @@
@ -89,7 +89,7 @@ rec {
} }
# vim: ft=nix # vim: ft=nix
''} ''} > /dev/null
fi fi
fi fi