Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-04-06 16:01:14 +02:00
493 changed files with 4687 additions and 2055 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python3, perl
}:
, pandoc, ethtool, iproute2, libnl, udev, python3, perl
} :
let
version = "34.0";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake pkg-config pandoc docutils ];
buildInputs = [ libnl ethtool iproute udev python3 perl ];
buildInputs = [ libnl ethtool iproute2 udev python3 perl ];
cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run"