diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/bootchart/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/chase/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/das_watchdog/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/fakechroot/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/gdmap/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/hardinfo/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/illum/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/lshw/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/netdata/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/pciutils/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/supervise/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/system/thermald/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/wsmancli/default.nix | 3 |
15 files changed, 57 insertions, 15 deletions
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 34da8d400811..f99d22becdb8 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; pythonPath = with python2Packages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index e1c163f41709..6dcaeed325ae 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "chase-${version}"; version = "0.5.2"; - buildInputs = [ pkgconfig libatomic_ops boehmgc ] ; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libatomic_ops boehmgc ] ; src = fetchurl { url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz"; sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f"; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 2e12345783d2..6f4b94f826d7 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig curl libdbi libgcrypt libmemcached + curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt libxml2 libmysql postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index fbca63b0e0a3..bcea40b1193f 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr"; }; - buildInputs = [ libgtop xmessage which pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgtop xmessage which ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index be3a32de251f..25470af9bb30 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; }; - buildInputs = [ autoreconfHook perl ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { homepage = https://github.com/dex4er/fakechroot; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index b03ec34972eb..72938216b0a4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 11236b7a9d10..a2bffab3a981 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Not adding 'hostname' command, the build shouldn't depend on what the build # host is called. - buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which gtk2 pcre glib libxml2 libsoup ]; # Fixes '#error You must compile this program without "-O"' hardeningDisable = [ "all" ]; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index d8faeea19d84..03373300a948 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; - buildInputs = [ pkgconfig ninja libevdev libev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ninja libevdev libev ]; configurePhase = '' bash ./configure diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index a26237bc045b..499f7c461546 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -19,14 +19,16 @@ stdenv.mkDerivation rec { sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; })]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = lib.optionals withGUI [ gtk2 sqlite ]; + # Fix version info. preConfigure = '' sed -e "s/return \"unknown\"/return \"${version}\"/" \ -i src/core/version.cc ''; - buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; - makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 236474343b4a..ed177820b644 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec{ sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n"; }; - buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ zlib libuuid ]; # Allow UI to load when running as non-root patches = [ ./web_access.patch ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 8a4fe6cb3cff..7508b4fc56c4 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"; }; - buildInputs = [ pkgconfig zlib kmod which ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib kmod which ]; makeFlags = "SHARED=yes PREFIX=\${out}"; diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix new file mode 100644 index 000000000000..838663c30720 --- /dev/null +++ b/pkgs/tools/system/supervise/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "supervise-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "catern"; + repo = "supervise"; + rev = "v${version}"; + sha256 = "1cjdxgns3gh2ir4kcmjdmc480w8sm49inws0ihhjmnisjy4100lg"; + }; + + installPhase = '' + mkdir -p $out/bin + cp supervise unlinkwait -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/catern/supervise; + description = "A minimal unprivileged process supervisor making use of modern Linux features"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ catern ]; + }; +} diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 7c81a028810d..a3e90f32c0ab 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; }; - buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index a9a034ebde91..6dfc6d1349d0 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl stdenv.cc.libc.static ] ++ stdenv.lib.optional (libuuid != null) (libuuid.overrideAttrs (attrs: { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; })); diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index c1c62718de2d..bd6ec17ceec1 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; }; - buildInputs = [ autoconf automake libtool pkgconfig openwsman openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake libtool openwsman openssl ]; preConfigure = '' ./bootstrap |