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

Merge pull request #55690 from Ma27/fix-osquery

Browse Source 
osquery: fix build
This commit is contained in:
Jaka Hudoklin 2019-02-15 19:52:27 +01:00 committed by GitHub
commit 2912c1c8ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/networking/lldpd/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo { stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
, libevent, readline, net_snmp }: , libevent, readline, net_snmp, openssl
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lldpd-${version}"; name = "lldpd-${version}";
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ pkgconfig removeReferencesTo ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ];
buildInputs = [ libevent readline net_snmp ]; buildInputs = [ libevent readline net_snmp openssl ];
enableParallelBuilding = true; enableParallelBuilding = true;

14
pkgs/tools/system/osquery/default.nix
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, fetchgit , gtest, sqlite, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl
}: }:
let let
@ -61,6 +61,16 @@ stdenv.mkDerivation rec {
sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx"; sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx";
}; };
}); });
# dpkg 1.19.2 dropped api in `<dpkg/dpkg-db.h>` which breaks compilation.
dpkg' = dpkg.overrideAttrs (old: rec {
name = "dpkg-${version}";
version = "1.19.0.5";
src = fetchurl {
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041";
};
});
in [ in [
udev audit udev audit
@ -69,7 +79,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