diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:40:19 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:42:03 +0100 |
| commit | 06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732 (patch) | |
| tree | 01b8b4e11f3cf57bdaa9d3130beb1b5f05ff6fd1 /pkgs/tools/system/collectd | |
| parent | cacf3f6c1e4dddc3d44b442fbc2cec4d7b935dcb (diff) | |
| download | nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.gz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.bz2 nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.lz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.xz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.zst nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.zip | |
*: fix builds by disregarding warning from new glibc
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.
In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
Diffstat (limited to 'pkgs/tools/system/collectd')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4210a0a04a5..692016153a6 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; }; - NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - buildInputs = [ pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt @@ -45,6 +43,8 @@ stdenv.mkDerivation rec { # for some reason libsigrok isn't auto-detected configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; |