diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-22 00:58:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 00:58:31 +0200 |
| commit | eef9694ebcb768345657b80e9d31bfc8e4be5190 (patch) | |
| tree | 459d10fae562984e52085fd7ffbf5ec2f8322216 /pkgs/tools/system | |
| parent | 449df5db04c51df006dc0c7fd877f95e6dbf4b88 (diff) | |
| parent | 9332bcad1813a87d7cd51e94dd9fd4a4aa11093c (diff) | |
| download | nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.gz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.bz2 nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.lz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.xz nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.tar.zst nixpkgs-eef9694ebcb768345657b80e9d31bfc8e4be5190.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e00c2bfafb3..673d29d61aa 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config +{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests , curl, libcap, libuuid, lm_sensors, zlib @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ curl.dev zlib.dev ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { ]; postFixup = '' - rm -r $out/sbin + wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; passthru.tests.netdata = nixosTests.netdata; |