From 359dd3b8ac60c741d9c36dea47a85529b4398c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Oct 2014 19:29:28 +0200 Subject: [PATCH] nixos: fix two pipefail problems It failed since 3c6efec2c09, i.e. #4453. Now it should "work" the same as before. --- nixos/modules/services/hardware/udev.nix | 1 + nixos/modules/system/boot/stage-1.nix | 2 ++ 2 files changed, 3 insertions(+) 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