movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos: fix two pipefail problems

Browse source 
It failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.
This commit is contained in:
Vladimír Čunát 2014-10-19 19:29:28 +02:00
parent 7c594d4b9e
commit 359dd3b8ac
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/hardware/udev.nix
View file

@ -31,6 +31,7 @@ let
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
shopt -s nullglob shopt -s nullglob
set +o pipefail
# Set a reasonable $PATH for programs called by udev rules. # Set a reasonable $PATH for programs called by udev rules.
echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules

2
nixos/modules/system/boot/stage-1.nix
View file

@ -34,6 +34,8 @@ let
doublePatchelf = pkgs.stdenv.isArm; doublePatchelf = pkgs.stdenv.isArm;
} }
'' ''
set +o pipefail
mkdir -p $out/bin $out/lib mkdir -p $out/bin $out/lib
ln -s $out/bin $out/sbin ln -s $out/bin $out/sbin