Merge pull request #276038 from pete3n/update-kismet

kismet: fix cross compilation
This commit is contained in:
Nick Cao 2023-12-23 14:52:27 -05:00 committed by GitHub
commit d8aba6fe40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, autoreconfHook
, binutils , binutils
, elfutils , elfutils
, fetchurl , fetchurl
@ -20,7 +21,7 @@
, python3 , python3
, sqlite , sqlite
, withNetworkManager ? false , withNetworkManager ? false
, withPython ? true , withPython ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
, withSensors ? false , withSensors ? false
, zlib , zlib
}: }:
@ -37,6 +38,8 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace Makefile.in \ substituteInPlace Makefile.in \
--replace "-m 4550" "" --replace "-m 4550" ""
substituteInPlace configure.ac \
--replace "pkg-config" "$PKG_CONFIG"
''; '';
postConfigure = '' postConfigure = ''
@ -47,10 +50,21 @@ stdenv.mkDerivation rec {
-i Makefile -i Makefile
''; '';
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook
pkg-config pkg-config
protobuf
protobufc
] ++ lib.optionals withPython [ ] ++ lib.optionals withPython [
python3 (python3.withPackages (ps: [
ps.numpy
ps.protobuf
ps.pyserial
ps.setuptools
ps.websockets
]))
]; ];
buildInputs = [ buildInputs = [
@ -75,17 +89,6 @@ stdenv.mkDerivation rec {
lm_sensors lm_sensors
]; ];
propagatedBuildInputs = [
] ++ lib.optionals withPython [
(python3.withPackages (ps: [
ps.numpy
ps.protobuf
ps.pyserial
ps.setuptools
ps.websockets
]))
];
configureFlags = [ configureFlags = [
"--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478 "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478
] ++ lib.optionals (!withNetworkManager) [ ] ++ lib.optionals (!withNetworkManager) [