Avoid with lib;
at the top level in pkgs/top-level/unixtools.nix
This commit is contained in:
parent
a7cdb7f2b1
commit
11bf7021af
1 changed files with 9 additions and 4 deletions
|
@ -10,9 +10,14 @@
|
||||||
# instance, if your program needs to use "ps", just list it as a build
|
# instance, if your program needs to use "ps", just list it as a build
|
||||||
# input, not "procps" which requires Linux.
|
# input, not "procps" which requires Linux.
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
inherit (lib)
|
||||||
|
getBin
|
||||||
|
getOutput
|
||||||
|
mapAttrs
|
||||||
|
platforms
|
||||||
|
;
|
||||||
|
|
||||||
version = "1003.1-2008";
|
version = "1003.1-2008";
|
||||||
|
|
||||||
singleBinary = cmd: providers: let
|
singleBinary = cmd: providers: let
|
||||||
|
@ -23,7 +28,7 @@ let
|
||||||
meta = {
|
meta = {
|
||||||
mainProgram = cmd;
|
mainProgram = cmd;
|
||||||
priority = 10;
|
priority = 10;
|
||||||
platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all;
|
platforms = platforms.${stdenv.hostPlatform.parsed.kernel.name} or platforms.all;
|
||||||
};
|
};
|
||||||
passthru = { inherit provider; };
|
passthru = { inherit provider; };
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
|
@ -187,7 +192,7 @@ let
|
||||||
|
|
||||||
# Compatibility derivations
|
# Compatibility derivations
|
||||||
# Provided for old usage of these commands.
|
# Provided for old usage of these commands.
|
||||||
compat = with bins; lib.mapAttrs makeCompat {
|
compat = with bins; mapAttrs makeCompat {
|
||||||
procps = [ ps sysctl top watch ];
|
procps = [ ps sysctl top watch ];
|
||||||
util-linux = [ fsck fdisk getopt hexdump mount
|
util-linux = [ fsck fdisk getopt hexdump mount
|
||||||
script umount whereis write col column ];
|
script umount whereis write col column ];
|
||||||
|
|
Loading…
Reference in a new issue