diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-02-10 10:13:55 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2022-03-07 12:23:46 +0800 |
| commit | c35ec1c0317a43c90bd016cc6ca4868af1280f23 (patch) | |
| tree | d4fc6a7fa1e61c336a3e61d7b4c9b40824aff034 /pkgs/os-specific | |
| parent | fd5ead0eed11a41d44d9d8900e8cce62ee39d02b (diff) | |
| download | nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar.gz nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar.bz2 nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar.lz nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar.xz nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.tar.zst nixpkgs-c35ec1c0317a43c90bd016cc6ca4868af1280f23.zip | |
lttng-modules: prepend kernel.makeFlags to makeFlags, move moduleBuildDependencies to nativeBuildInputs
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8753f34087c..99ffb7756da 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0hzksx2fw008jdsgfzpws9g7imy6ryw09ai5y0knvrmvr68nvj57"; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - preConfigure = '' - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - export INSTALL_MOD_PATH="$out" - ''; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; installTargets = [ "modules_install" ]; |