BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

osquery: fix build

Browse source 
As discussed in #51756, recently packaged versions of `lvm2` miss the
`lvm2app.h` header which breaks the osquery build.

Please note that this simply fixes the build and is not an upgrade. The
CMake patches are fairly diverged in constrast to the current upstream
packaging which requires a lot more effort I can't provide ATM.

cc @markuskowa @hedning
This commit is contained in:
Maximilian Bosch 2018-12-23 23:48:08 +01:00
parent e5533ffb73
commit 8934dae2c3
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/tools/system/osquery/default.nix
View file

@ -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