mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

treewide: cleanup procps uses

Browse source
This commit is contained in:
Matthew Bauer 2018-03-26 18:42:46 -05:00
parent ce8ce600ae
commit ef428ab202
10 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/qsyncthingtray/default.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps
, qtbase, qtwebengine, qtwebkit
, cmake
, syncthing

3
pkgs/development/compilers/go/1.10.nix
View file

@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
++ optionals stdenv.isLinux [ procps ];
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

3
pkgs/development/compilers/go/1.9.nix
View file

@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
++ optionals stdenv.isLinux [ procps ];
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

6
pkgs/development/compilers/rust/rustc.nix
View file

@ -1,5 +1,5 @@
{ stdenv, targetPackages
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
, which, libffi, gdb
, version
@ -19,8 +19,6 @@ let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
procps = if stdenv.isDarwin then darwin.ps else args.procps;
llvmShared = llvm.override { enableSharedLibraries = true; };
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
@ -127,7 +125,7 @@ stdenv.mkDerivation {
# ps is needed for one of the test cases
nativeBuildInputs =
[ file python2 procps rustPlatform.rust.rustc git cmake
[ file python2 ps rustPlatform.rust.rustc git cmake
which libffi
]
# Only needed for the debuginfo tests

4
pkgs/os-specific/linux/checksec/default.nix
View file

@ -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 -"
'';

4
pkgs/os-specific/linux/gogoclient/default.nix
View file

@ -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
'';

4
pkgs/shells/grml-zsh-config/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
};
buildInputs = [ zsh coreutils txt2tags ]
++ optional stdenv.isLinux [ inetutils procps ];
buildInputs = [ zsh coreutils txt2tags procps ]
++ optional stdenv.isLinux [ inetutils ];
buildPhase = ''
cd doc

5
pkgs/tools/networking/network-manager/openconnect.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
, withGnome ? true, gnome3, procps, kmod }:
, withGnome ? true, gnome3, sysctl, kmod }:
let
pname = "NetworkManager-openconnect";
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace "configure" \
--replace "/sbin/sysctl" "${procps}/bin/sysctl"
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
substituteInPlace "src/nm-openconnect-service.c" \
--replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \
--replace "/sbin/modprobe" "${kmod}/bin/modprobe"
@ -42,4 +42,3 @@ in stdenv.mkDerivation rec {
inherit (networkmanager.meta) maintainers platforms;
};
}

4
pkgs/tools/networking/network-manager/strongswan.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl
, gnome3, libgnome-keyring, libsecret }:
stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace "configure" \
--replace "/sbin/sysctl" "${procps}/bin/sysctl"
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
'';
configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ];

4
pkgs/top-level/all-packages.nix
View file

@ -14012,12 +14012,12 @@ with pkgs;
utillinuxCurses = utillinux;
utillinuxMinimal = appendToName "minimal" (utillinux.override {
utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override {
minimal = true;
ncurses = null;
perl = null;
systemd = null;
});
}) else throw "utillinux is unsupported on non-Linux";
v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { };