Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

nvidia_x11: Use kernel.dev instead of kernelDev

Signed-off-by: Shea Levy <shea@shealevy.com>
  • Loading branch information...
commit e4bc4a4b12cc70a49c6f0273379fc21f20424451 1 parent 6f1c485
@shlevy authored
View
5 pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -14,11 +14,12 @@ buildPhase() {
echo "Building linux driver against kernel: $kernel";
cd kernel
kernelVersion=$(cd $kernel/lib/modules && ls)
- sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
+ sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source/)
+ sysOut=$(echo $kernel/lib/modules/$kernelVersion/build/)
unset src # used by the nv makefile
# Hack necessary to compile on 2.6.28.
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated"
- make SYSSRC=$sysSrc module
+ make SYSSRC=$sysSrc SYSOUT=$sysOut module
cd ..
fi
}
View
6 pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl
+{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -11,7 +11,7 @@ with stdenv.lib;
let versionNumber = "310.32"; in
stdenv.mkDerivation {
- name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
+ name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
builder = ./builder.sh;
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
inherit versionNumber libsOnly;
- kernel = if libsOnly then null else kernelDev;
+ kernel = if libsOnly then null else kernel.dev;
dontStrip = true;
Please sign in to comment.
Something went wrong with that request. Please try again.