summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authordukzcry <lomka@gero.in>2018-06-24 11:49:08 +0300
committerdukzcry <lomka@gero.in>2018-06-24 11:49:48 +0300
commit9645c867a36c6803b17bcfaa965f20273498f13c (patch)
tree2c2295f7dba664b2029b4b03a6da3a85603beb7f /pkgs
parent49a16a290e68ebb1ef5acadf25cf149d0d530d05 (diff)
downloadnixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar.gz
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar.bz2
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar.lz
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar.xz
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.tar.zst
nixpkgs-9645c867a36c6803b17bcfaa965f20273498f13c.zip
nvidia-x11: pass kernel.modDirVersion
Diffstat (limited to 'pkgs')
-rwxr-xr-xpkgs/os-specific/linux/nvidia-x11/builder.sh1
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/generic.nix1
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 cd7733f43a4..15c3e10e119 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 13e5d1b76ea..0fe0f3d92c9 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" ];