diff options
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 448e91986fc..51bd4d725a8 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,10 +17,8 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make IGNORE_PREEMPT_RT_PRESENCE=1 NV_BUILD_SUPPORTS_HMM=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make $makeFlags -j $NIX_BUILD_CORES module cd .. fi diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 754d9887cb2..282d9728821 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -75,7 +75,12 @@ let kernel = if libsOnly then null else kernel.dev; kernelVersion = if libsOnly then null else kernel.modDirVersion; - makeFlags = optionals (!libsOnly) kernel.makeFlags; + makeFlags = optionals (!libsOnly) (kernel.makeFlags ++ [ + "IGNORE_PREEMPT_RT_PRESENCE=1" + "NV_BUILD_SUPPORTS_HMM=1" + "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]); hardeningDisable = [ "pic" "format" ]; |