From 13de8c6bd2816bd0cd66433be93168720ce59d55 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 24 Jun 2017 16:40:49 +0200 Subject: l: set symlinkJoin pkgs in correct order --- lass/1systems/iso.nix | 2 +- lass/2configs/htop.nix | 2 +- lass/2configs/mail.nix | 2 +- lass/2configs/mc.nix | 2 +- lass/2configs/mpv.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 8b2e82d3..b45d5b22 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -21,7 +21,6 @@ with import ; coreutils = pkgs.symlinkJoin { name = "coreutils-hack"; paths = [ - pkgs.coreutils (pkgs.writeDashBin "tee" '' if test "$1" = /dev/stderr; then while read -r line; do @@ -32,6 +31,7 @@ with import ; ${super.coreutils}/bin/tee "$@" fi '') + pkgs.coreutils ]; }; }; diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix index ec86d412..d9307347 100644 --- a/lass/2configs/htop.nix +++ b/lass/2configs/htop.nix @@ -8,7 +8,6 @@ with import ; htop = pkgs.symlinkJoin { name = "htop"; paths = [ - super.htop (pkgs.writeDashBin "htop" '' export HTOPRC=${pkgs.writeText "htoprc" '' fields=0 48 17 18 38 39 40 2 46 47 49 1 @@ -38,6 +37,7 @@ with import ; ''} exec ${super.htop}/bin/htop "$@" '') + super.htop ]; }; }; diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 5748b6ea..feb53270 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -116,10 +116,10 @@ let mutt = pkgs.symlinkJoin { name = "mutt"; paths = [ - pkgs.neomutt (pkgs.writeDashBin "mutt" '' exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@ '') + pkgs.neomutt ]; }; diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix index 62fd52f3..3bd1852a 100644 --- a/lass/2configs/mc.nix +++ b/lass/2configs/mc.nix @@ -325,7 +325,6 @@ in { (pkgs.symlinkJoin { name = "mc"; paths = [ - pkgs.mc (pkgs.writeDashBin "mc" '' export MC_DATADIR=${pkgs.writeOut "mc-ext" { "/mc.ext".link = mcExt; @@ -334,6 +333,7 @@ in { export TERM=xterm-256color exec ${pkgs.mc}/bin/mc -S xoria256 "$@" '') + pkgs.mc ]; }) ]; diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix index c8b59085..04fd9213 100644 --- a/lass/2configs/mpv.nix +++ b/lass/2configs/mpv.nix @@ -10,10 +10,10 @@ let mpv = pkgs.symlinkJoin { name = "mpv"; paths = [ - pkgs.mpv (pkgs.writeDashBin "mpv" '' exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@" '') + pkgs.mpv ]; }; -- cgit v1.2.3