summary refs log tree commit diff
path: root/pkgs/tools/misc/keychain
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-03-25 23:01:31 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-03-26 17:40:55 -0500
commitce8ce600ae41d3899e4a556fa9ff8a1a34374063 (patch)
tree3ea6538af9f648999a7a68cb44818c52f33963c6 /pkgs/tools/misc/keychain
parent675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 (diff)
downloadnixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.gz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.bz2
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.lz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.xz
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.zst
nixpkgs-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.zip
unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
Diffstat (limited to 'pkgs/tools/misc/keychain')
-rw-r--r--pkgs/tools/misc/keychain/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 7fd9897a71b..133a461964b 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
-, perl, procps, gnugrep, gawk, findutils, gnused
-, withProcps ? stdenv.isLinux }:
+, perl, procps, gnugrep, gawk, findutils, gnused }:
 
 stdenv.mkDerivation rec {
   name = "keychain-${version}";
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${gnused}/bin" \
       --prefix PATH ":" "${findutils}/bin" \
       --prefix PATH ":" "${gawk}/bin" \
-      ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""}
+      --prefix PATH ":" "${procps}/bin"
   '';
 
   meta = {