summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-20 19:30:14 +0200
committertv <tv@krebsco.de>2017-06-20 19:30:14 +0200
commitcc1ae23f2676335e020492f7b1941767139ac813 (patch)
treebcafe4e4a996bc8099d64c61e87dfda0825dccef
parent803ccdb2f602981c0c5842fafc9cc74b4c714c5e (diff)
concat: RIP
-rw-r--r--1systems/iso.nix31
1 files changed, 18 insertions, 13 deletions
diff --git a/1systems/iso.nix b/1systems/iso.nix
index 1e4f9c55f..c679241e5 100644
--- a/1systems/iso.nix
+++ b/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
+ '')
+ ];
+ };
+ };
};
};
}