From 8934dae2c39aa26ed9ac446bd08c7b6cce075638 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 Dec 2018 23:48:08 +0100 Subject: [PATCH] osquery: fix build 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 --- pkgs/tools/system/osquery/default.nix | 18 ++++++++++++++++-- 1 file 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