public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52744 from Ma27/fix-osquery

Browse Source 
osquery: fix build
This commit is contained in:
Maximilian Bosch
2018-12-24 15:33:51 +01:00
committed by GitHub
parent badc0a05f9 8934dae2c3
commit 8ae753e283
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/osquery/default.nix
+16 -2
View File
@@ -4,7 +4,7 @@
, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
, thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
, openssl, file, doxygen , openssl, file, doxygen
, gtest, sqlite, fpm, zstd, rdkafka, rapidjson , gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit
}: }:
let let
@@ -43,6 +43,20 @@ stdenv.mkDerivation rec {
gflags' = google-gflags.overrideAttrs (old: { gflags' = google-gflags.overrideAttrs (old: {
cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags; 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 [ in [
udev audit udev audit
@@ -51,7 +65,7 @@ stdenv.mkDerivation rec {
customMemoryManagement = false; customMemoryManagement = false;
}) })
lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg lvm2' libgcrypt libarchive libgpgerror libuuid iptables dpkg
lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit
yara lldpd gflags' thrift boost yara lldpd gflags' thrift boost
glog gbenchmark snappy openssl glog gbenchmark snappy openssl