diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-25 23:16:06 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-25 23:16:06 +0200 |
| commit | 826da6c222d359ede5d032173c204bf37715cdc8 (patch) | |
| tree | d6d03c4ef75144757d848f1cbf1c47464dbd0f82 /krebs/5pkgs | |
| parent | 69b58e1c75f8596a2bc6a46c4b16c29afde2ae93 (diff) | |
| parent | a15592411e0703180d36dbd8fd50503a6d8d33bb (diff) | |
Merge remote-tracking branch 'ni/master' into HEAD
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/writers.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/krebs/5pkgs/writers.nix b/krebs/5pkgs/writers.nix index 49ca3557e..f1626078e 100644 --- a/krebs/5pkgs/writers.nix +++ b/krebs/5pkgs/writers.nix @@ -144,9 +144,14 @@ with import <stockholm/lib>; env = filevars // { passAsFile = attrNames filevars; }; in + # Use a subshell because <nixpkgs/stdenv/generic/setup.sh>'s genericBuild + # sources (or evaluates) the buildCommand and we don't want to modify its + # shell. In particular, exitHandler breaks in multiple ways with set -u. pkgs.runCommand name env /* sh */ '' - set -efu - ${concatMapStringsSep "\n" (getAttr "install") files} + ( + set -efu + ${concatMapStringsSep "\n" (getAttr "install") files} + ) ''; writeHaskell = |