diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
| commit | c45e9d0fac5158d90f8c951a2899755181e97dc7 (patch) | |
| tree | 87cdea30c650739a0ef20c6342deb39e77f1e07b /pkgs/tools/system | |
| parent | 4c5a5dc6270d0552f71937d5d73cc36a7f3a2326 (diff) | |
| parent | 996d14a00489c5a20258229d7837649e91e9b2fc (diff) | |
| download | nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.gz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.bz2 nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.lz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.xz nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.zst nixlib-c45e9d0fac5158d90f8c951a2899755181e97dc7.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/osquery/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 6cdaec10868f..c7faf4d3889e 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -4,7 +4,7 @@ , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen -, gtest, sqlite, fpm, zstd, rdkafka, rapidjson +, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit }: let @@ -43,6 +43,20 @@ stdenv.mkDerivation rec { gflags' = google-gflags.overrideAttrs (old: { cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; }); + + # use older `lvm2` source for osquery, the 2.03 sourcetree + # will break osquery due to the lacking header `lvm2app.h`. + # + # https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295 + lvm2' = lvm2.overrideAttrs (old: rec { + name = "lvm2-${version}"; + version = "2.02.183"; + src = fetchgit { + url = "git://sourceware.org/git/lvm2.git"; + rev = "v${version}"; + sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx"; + }; + }); in [ udev audit @@ -51,7 +65,7 @@ stdenv.mkDerivation rec { customMemoryManagement = false; }) - lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg + lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit yara lldpd gflags' thrift boost glog gbenchmark snappy openssl |