diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 08:57:04 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-18 08:57:16 -0700 |
commit | f7a112f6c44b95d0af2954942fb10c39fdd478f8 (patch) | |
tree | a229be340073afa38a7bc73d583695354eff0265 /pkgs/servers/monitoring/prometheus | |
parent | c227fb4b17469864298087f8c9367e4cfc8dd6b9 (diff) | |
parent | d189df235ae14d4c8b1742b0f77ac1ae860d2fa3 (diff) | |
download | nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.gz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.bz2 nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.lz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.xz nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.tar.zst nixpkgs-f7a112f6c44b95d0af2954942fb10c39fdd478f8.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/graphics/emulsion/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/rust/bindgen/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/misc/emulators/ruffle/default.nix pkgs/tools/misc/code-minimap/default.nix
Diffstat (limited to 'pkgs/servers/monitoring/prometheus')
-rw-r--r-- | pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index c143c44704b..1dbb3179627 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }: +{ stdenv, rustPlatform, fetchFromGitHub, lib, libiconv, Security, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; |