diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-06-26 05:29:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 05:29:46 +0000 |
| commit | 74f706d6cc82b47cccd6ddecd698a7a100077810 (patch) | |
| tree | 47be1c471da4578b9ac6e39b119fdb286b072397 | |
| parent | c16eb044257d10f979d9cd332eb979872471589e (diff) | |
| parent | 9645c867a36c6803b17bcfaa965f20273498f13c (diff) | |
| download | nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar.gz nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar.bz2 nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar.lz nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar.xz nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.tar.zst nixlib-74f706d6cc82b47cccd6ddecd698a7a100077810.zip | |
Merge pull request #42516 from repos-holder/master
nvidia-x11: pass kernel.modDirVersion
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 |
2 files changed, 1 insertions, 1 deletions
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" ]; |