Merge pull request #276038 from pete3n/update-kismet
kismet: fix cross compilation
This commit is contained in:
commit
d8aba6fe40
1 changed files with 16 additions and 13 deletions
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, binutils
|
||||
, elfutils
|
||||
, fetchurl
|
||||
|
@ -20,7 +21,7 @@
|
|||
, python3
|
||||
, sqlite
|
||||
, withNetworkManager ? false
|
||||
, withPython ? true
|
||||
, withPython ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, withSensors ? false
|
||||
, zlib
|
||||
}:
|
||||
|
@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace "-m 4550" ""
|
||||
substituteInPlace configure.ac \
|
||||
--replace "pkg-config" "$PKG_CONFIG"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
@ -47,10 +50,21 @@ stdenv.mkDerivation rec {
|
|||
-i Makefile
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
protobuf
|
||||
protobufc
|
||||
] ++ lib.optionals withPython [
|
||||
python3
|
||||
(python3.withPackages (ps: [
|
||||
ps.numpy
|
||||
ps.protobuf
|
||||
ps.pyserial
|
||||
ps.setuptools
|
||||
ps.websockets
|
||||
]))
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -75,17 +89,6 @@ stdenv.mkDerivation rec {
|
|||
lm_sensors
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
] ++ lib.optionals withPython [
|
||||
(python3.withPackages (ps: [
|
||||
ps.numpy
|
||||
ps.protobuf
|
||||
ps.pyserial
|
||||
ps.setuptools
|
||||
ps.websockets
|
||||
]))
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478
|
||||
] ++ lib.optionals (!withNetworkManager) [
|
||||
|
|
Loading…
Reference in a new issue