diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-25 23:01:31 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-26 17:40:55 -0500 |
commit | ce8ce600ae41d3899e4a556fa9ff8a1a34374063 (patch) | |
tree | 3ea6538af9f648999a7a68cb44818c52f33963c6 /pkgs/tools/networking | |
parent | 675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 (diff) | |
download | nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.gz nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.bz2 nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.lz nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.xz nixlib-ce8ce600ae41d3899e4a556fa9ff8a1a34374063.tar.zst nixlib-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/networking')
-rw-r--r-- | pkgs/tools/networking/i2p/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index ec268d5d77f6..58533f683e71 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,4 +1,4 @@ -{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: +{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: let wrapper = stdenv.mkDerivation rec { name = "wrapper-${version}"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { -e "s#uname#${coreutils}/bin/uname#" \ -e "s#which#${which}/bin/which#" \ -e "s#%gettext%#${gettext}/bin/gettext#" \ - -e "s#/usr/ucb/ps#${procps}/bin/ps#" \ + -e "s#/usr/ucb/ps#${ps}/bin/ps#" \ -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \ -e "s#%INSTALL_PATH#$out#" \ -e 's#%USER_HOME#$HOME#' \ |