diff options
author | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-23 18:50:06 +0100 |
commit | 0e8d2725dcc1aef5c56e63c939249b27190f6367 (patch) | |
tree | 654e83b5f539b31947ee5011a0d1df797bf4c75d /pkgs/tools/system | |
parent | 13c04c837db0f69705cfa4478c513b2230243ca2 (diff) | |
parent | 415e1983ca650777d476d39de1db61a9e9877621 (diff) | |
download | nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.gz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.bz2 nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.lz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.xz nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.tar.zst nixlib-0e8d2725dcc1aef5c56e63c939249b27190f6367.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/system/wsmancli/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index c428fb07facd..b0c6b0730296 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation rec { stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations"; meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index d66d4b575783..c1c62718de2d 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./bootstrap configureFlagsArray=( - LIBS="-L${openssl}/lib -lssl -lcrypto" + LIBS="-L${openssl.out}/lib -lssl -lcrypto" ) ''; |