diff options
author | lassulus <lass@lassul.us> | 2017-06-20 19:31:19 +0200 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-06-20 19:31:19 +0200 |
commit | 915ccf6ee26688be9daf37a6083b91be95cae024 (patch) | |
tree | 18dd85796c90fe7898a2b3a8e8c505ea672598a3 /makefu | |
parent | fbabdb5081366e295fb10a2486fcc66e43a20ed1 (diff) | |
parent | a9f4ad7586bfb543cdcdeacf93b71bdce506621a (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'makefu')
-rw-r--r-- | makefu/1systems/iso.nix | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix index 1e4f9c55f..c679241e5 100644 --- a/makefu/1systems/iso.nix +++ b/makefu/1systems/iso.nix @@ -32,19 +32,24 @@ with import <stockholm/lib>; # hack `tee` behavior nixpkgs.config.packageOverrides = super: { irc-announce = super.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> { - pkgs = pkgs // { coreutils = pkgs.concat "coreutils-hack" [ - pkgs.coreutils - (pkgs.writeDashBin "tee" '' - if test "$1" = /dev/stderr; then - while read -r line; do - echo "$line" - echo "$line" >&2 - done - else - ${super.coreutils}/bin/tee "$@" - fi - '') - ];}; + pkgs = pkgs // { + coreutils = pkgs.symlinkJoin { + name = "coreutils-hack"; + paths = [ + pkgs.coreutils + (pkgs.writeDashBin "tee" '' + if test "$1" = /dev/stderr; then + while read -r line; do + echo "$line" + echo "$line" >&2 + done + else + ${super.coreutils}/bin/tee "$@" + fi + '') + ]; + }; + }; }; }; } |