diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-05 12:05:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-05 12:05:41 +0000 |
| commit | 27a4e52731ac44055f58f29a0513aef79c419c43 (patch) | |
| tree | cdbd76ee7ca08a8abbee7899abef9e1228f22128 /pkgs/servers | |
| parent | 05a5c6450fb96d019a21ca3b8833bc90215e32a9 (diff) | |
| parent | 0c7c76fa9e2f5c7b446c1182c79eabac08588392 (diff) | |
| download | nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar.gz nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar.bz2 nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar.lz nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar.xz nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.tar.zst nixpkgs-27a4e52731ac44055f58f29a0513aef79c419c43.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/owncast/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/rt/default.nix | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 258247c34f4..e8fa4feb6af 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -13,8 +13,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-p273O5JLFX1dA2caV3lVVL9YNTcGMSrC7DWieUfUmqI="; }; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ which coreutils rrdtool diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index 774f51bc0f6..313d17e8e8d 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { propagatedBuildInputs = [ ffmpeg ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; preInstall = '' mkdir -p $out diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index ff0bbd6b97d..2b5188f743a 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + makeWrapper ]; buildInputs = [ - makeWrapper perl (buildEnv { name = "rt-perl-deps"; |