diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-26 18:42:46 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 18:17:37 -0500 |
| commit | ef428ab202322b93930c3db0d66573c16f692c5f (patch) | |
| tree | c340599d258ab4a0054556f473413681bbca9691 /pkgs/os-specific | |
| parent | ce8ce600ae41d3899e4a556fa9ff8a1a34374063 (diff) | |
| download | nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar.gz nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar.bz2 nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar.lz nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar.xz nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.tar.zst nixpkgs-ef428ab202322b93930c3db0d66573c16f692c5f.zip | |
treewide: cleanup procps uses
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/checksec/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/gogoclient/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1a879ba3330..1ef18f703d3 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }: +{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }: stdenv.mkDerivation rec { name = "checksec-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -" substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf" - substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" + substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -" substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" ''; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 521b81cd690..53895faa66c 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, nettools, iproute, procps}: +{stdenv, fetchurl, openssl, nettools, iproute, sysctl}: let baseName = "gogoclient"; version = "1.2"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ --replace "/sbin/route" "${nettools}/bin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ - --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; |