diff options
author | lassulus <lass@lassul.us> | 2017-06-24 16:40:49 +0200 |
---|---|---|
committer | lassulus <lass@lassul.us> | 2017-06-24 16:40:49 +0200 |
commit | 13de8c6bd2816bd0cd66433be93168720ce59d55 (patch) | |
tree | b1cf97e54797643688b627e331e2515cf22fd57e /lass | |
parent | ea2cd88ed355aa58e527cac6b3dcd7e3c524e730 (diff) |
l: set symlinkJoin pkgs in correct order
Diffstat (limited to 'lass')
-rw-r--r-- | lass/1systems/iso.nix | 2 | ||||
-rw-r--r-- | lass/2configs/htop.nix | 2 | ||||
-rw-r--r-- | lass/2configs/mail.nix | 2 | ||||
-rw-r--r-- | lass/2configs/mc.nix | 2 | ||||
-rw-r--r-- | 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 8b2e82d31..b45d5b228 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -21,7 +21,6 @@ with import <stockholm/lib>; 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 <stockholm/lib>; ${super.coreutils}/bin/tee "$@" fi '') + pkgs.coreutils ]; }; }; diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix index ec86d4120..d9307347e 100644 --- a/lass/2configs/htop.nix +++ b/lass/2configs/htop.nix @@ -8,7 +8,6 @@ with import <stockholm/lib>; 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 <stockholm/lib>; ''} exec ${super.htop}/bin/htop "$@" '') + super.htop ]; }; }; diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 5748b6eaf..feb532709 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 62fd52f3f..3bd1852a8 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 c8b590857..04fd9213e 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 ]; }; |