public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use killall

Browse Source
This commit is contained in:
Matthew Bauer 2018-06-27 16:47:21 -04:00
parent bceb29f177
commit 161414063f
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/syncthing-gtk/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobjectIntrospection }:
buildPythonApplication rec { buildPythonApplication rec {
version = "0.9.4"; version = "0.9.4";
@ -35,7 +38,7 @@ buildPythonApplication rec {
}) })
(substituteAll { (substituteAll {
src = ./paths.patch; src = ./paths.patch;
killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; killall = "${killall}/bin/killall";
syncthing = "${syncthing}/bin/syncthing"; syncthing = "${syncthing}/bin/syncthing";
}) })
]; ];

4
pkgs/servers/http/myserver/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls { lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
, libxml2, zlib, guile, texinfo, cppunit, psmisc }: , libxml2, zlib, guile, texinfo, cppunit, killall }:
let version = "0.11"; in let version = "0.11"; in
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# On GNU/Linux the `test_suite' process sometimes stays around, so # On GNU/Linux the `test_suite' process sometimes stays around, so
# forcefully terminate it. # forcefully terminate it.
postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; postCheck = "${killall}/bin/killall test_suite || true";
meta = { meta = {
description = "GNU MyServer, a powerful and easy to configure web server"; description = "GNU MyServer, a powerful and easy to configure web server";

9
pkgs/tools/misc/xfstests/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su
, time, utillinux, which, writeScript, xfsprogs }: , time, utillinux, which, writeScript, xfsprogs }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -90,7 +91,9 @@ stdenv.mkDerivation {
ln -s @out@/lib/xfstests/$f $f ln -s @out@/lib/xfstests/$f $f
done done
export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils
libcap lvm2 perl procps killall quota
utillinux which xfsprogs]}:$PATH
exec ./check "$@" exec ./check "$@"
''; '';