From a9f4ad7586bfb543cdcdeacf93b71bdce506621a Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 20 Jun 2017 19:30:14 +0200 Subject: concat: RIP --- makefu/1systems/iso.nix | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso.nix index 1e4f9c55..c679241e 100644 --- a/makefu/1systems/iso.nix +++ b/makefu/1systems/iso.nix @@ -32,19 +32,24 @@ with import ; # hack `tee` behavior nixpkgs.config.packageOverrides = super: { irc-announce = super.callPackage { - 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 + '') + ]; + }; + }; }; }; } -- cgit v1.2.3