l: set symlinkJoin pkgs in correct order
This commit is contained in:
parent
ea2cd88ed3
commit
13de8c6bd2
@ -21,7 +21,6 @@ with import <stockholm/lib>;
|
|||||||
coreutils = pkgs.symlinkJoin {
|
coreutils = pkgs.symlinkJoin {
|
||||||
name = "coreutils-hack";
|
name = "coreutils-hack";
|
||||||
paths = [
|
paths = [
|
||||||
pkgs.coreutils
|
|
||||||
(pkgs.writeDashBin "tee" ''
|
(pkgs.writeDashBin "tee" ''
|
||||||
if test "$1" = /dev/stderr; then
|
if test "$1" = /dev/stderr; then
|
||||||
while read -r line; do
|
while read -r line; do
|
||||||
@ -32,6 +31,7 @@ with import <stockholm/lib>;
|
|||||||
${super.coreutils}/bin/tee "$@"
|
${super.coreutils}/bin/tee "$@"
|
||||||
fi
|
fi
|
||||||
'')
|
'')
|
||||||
|
pkgs.coreutils
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -8,7 +8,6 @@ with import <stockholm/lib>;
|
|||||||
htop = pkgs.symlinkJoin {
|
htop = pkgs.symlinkJoin {
|
||||||
name = "htop";
|
name = "htop";
|
||||||
paths = [
|
paths = [
|
||||||
super.htop
|
|
||||||
(pkgs.writeDashBin "htop" ''
|
(pkgs.writeDashBin "htop" ''
|
||||||
export HTOPRC=${pkgs.writeText "htoprc" ''
|
export HTOPRC=${pkgs.writeText "htoprc" ''
|
||||||
fields=0 48 17 18 38 39 40 2 46 47 49 1
|
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 "$@"
|
exec ${super.htop}/bin/htop "$@"
|
||||||
'')
|
'')
|
||||||
|
super.htop
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -116,10 +116,10 @@ let
|
|||||||
mutt = pkgs.symlinkJoin {
|
mutt = pkgs.symlinkJoin {
|
||||||
name = "mutt";
|
name = "mutt";
|
||||||
paths = [
|
paths = [
|
||||||
pkgs.neomutt
|
|
||||||
(pkgs.writeDashBin "mutt" ''
|
(pkgs.writeDashBin "mutt" ''
|
||||||
exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@
|
exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@
|
||||||
'')
|
'')
|
||||||
|
pkgs.neomutt
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -325,7 +325,6 @@ in {
|
|||||||
(pkgs.symlinkJoin {
|
(pkgs.symlinkJoin {
|
||||||
name = "mc";
|
name = "mc";
|
||||||
paths = [
|
paths = [
|
||||||
pkgs.mc
|
|
||||||
(pkgs.writeDashBin "mc" ''
|
(pkgs.writeDashBin "mc" ''
|
||||||
export MC_DATADIR=${pkgs.writeOut "mc-ext" {
|
export MC_DATADIR=${pkgs.writeOut "mc-ext" {
|
||||||
"/mc.ext".link = mcExt;
|
"/mc.ext".link = mcExt;
|
||||||
@ -334,6 +333,7 @@ in {
|
|||||||
export TERM=xterm-256color
|
export TERM=xterm-256color
|
||||||
exec ${pkgs.mc}/bin/mc -S xoria256 "$@"
|
exec ${pkgs.mc}/bin/mc -S xoria256 "$@"
|
||||||
'')
|
'')
|
||||||
|
pkgs.mc
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
@ -10,10 +10,10 @@ let
|
|||||||
mpv = pkgs.symlinkJoin {
|
mpv = pkgs.symlinkJoin {
|
||||||
name = "mpv";
|
name = "mpv";
|
||||||
paths = [
|
paths = [
|
||||||
pkgs.mpv
|
|
||||||
(pkgs.writeDashBin "mpv" ''
|
(pkgs.writeDashBin "mpv" ''
|
||||||
exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@"
|
exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@"
|
||||||
'')
|
'')
|
||||||
|
pkgs.mpv
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user