summaryrefslogtreecommitdiffstats
path: root/lass/1systems/iso.nix
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-20 19:31:19 +0200
committerlassulus <lass@lassul.us>2017-06-20 19:31:19 +0200
commit915ccf6ee26688be9daf37a6083b91be95cae024 (patch)
tree18dd85796c90fe7898a2b3a8e8c505ea672598a3 /lass/1systems/iso.nix
parentfbabdb5081366e295fb10a2486fcc66e43a20ed1 (diff)
parenta9f4ad7586bfb543cdcdeacf93b71bdce506621a (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'lass/1systems/iso.nix')
-rw-r--r--lass/1systems/iso.nix31
1 files changed, 18 insertions, 13 deletions
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix
index eaeb1991f..8b2e82d31 100644
--- a/lass/1systems/iso.nix
+++ b/lass/1systems/iso.nix
@@ -17,19 +17,24 @@ with import <stockholm/lib>;
# my life sucks
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
+ '')
+ ];
+ };
+ };
};
};
boot.kernelParams = [ "copytoram" ];