diff options
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/fusion-inventory/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/longview/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/jmx-httpserver.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/seyren/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/uchiwa/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zipkin/default.nix | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 0034c253c77..02841c6acb9 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -24,7 +24,8 @@ perlPackages.buildPerlPackage rec { ''; buildTools = []; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + nativeBuildInputs = [ makeWrapper ]; + buildInputs = (with perlPackages; [ CGI DataStructureUtil FileCopyRecursive diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 96048005cb1..5d05dfd1ebb 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { --replace /etc/linode /run/longview ''; - buildInputs = [ perl makeWrapper glibc ] + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl glibc ] ++ (with perlPackages; [ LWP LWPProtocolHttps diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 0c5aa7d8a43..e6505857bf5 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation { sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; }; - buildInputs = [ jre makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; phases = "installPhase"; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 1d26afad3d8..4dd90cacb8b 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 121b31e46eb..a871bf87db2 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin $out/public diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index e84c422ea64..9395c3c61c1 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' |