diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-10-19 19:29:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-19 19:29:28 +0200 |
| commit | 359dd3b8ac60c741d9c36dea47a85529b4398c21 (patch) | |
| tree | 20bc8ef0830142323aa477d88bcf8dc722f56660 | |
| parent | 7c594d4b9e143b1194bb72dadad979245750174f (diff) | |
| download | nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar.gz nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar.bz2 nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar.lz nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar.xz nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.tar.zst nixpkgs-359dd3b8ac60c741d9c36dea47a85529b4398c21.zip | |
nixos: fix two pipefail problems
It failed since 3c6efec2c09, i.e. #4453. Now it should "work" the same as before.
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 068d14217a2..8ee4fb4d561 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -31,6 +31,7 @@ let buildCommand = '' mkdir -p $out shopt -s nullglob + set +o pipefail # Set a reasonable $PATH for programs called by udev rules. echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6b09559876c..74087c0ce63 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -34,6 +34,8 @@ let doublePatchelf = pkgs.stdenv.isArm; } '' + set +o pipefail + mkdir -p $out/bin $out/lib ln -s $out/bin $out/sbin |