From 9645c867a36c6803b17bcfaa965f20273498f13c Mon Sep 17 00:00:00 2001 From: dukzcry Date: Sun, 24 Jun 2018 11:49:08 +0300 Subject: [PATCH] nvidia-x11: pass kernel.modDirVersion --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 - pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index cd7733f43a48..15c3e10e1199 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,7 +17,6 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 13e5d1b76ea6..0fe0f3d92c92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -55,6 +55,7 @@ let outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; + kernelVersion = if libsOnly then null else kernel.modDirVersion; hardeningDisable = [ "pic" "format" ];