From 9f347eba61b2fca5ae5ece21fa74af5d3024bfb3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jul 2013 11:10:21 +0200
Subject: nvidia-x11: Fix building on older kernels

The 3.10 patch breaks building on 3.4 at least.
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c7fc5c44c22e..e4e9a2c02057 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,18 +8,24 @@
 
 with stdenv.lib;
 
-let versionNumber = "319.32";
-    kernel310patch = fetchurl {
-                       url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
-                       sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
-                     };
+let
 
-in stdenv.mkDerivation {
+  versionNumber = "319.32";
+  kernel310patch = fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia";
+    sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb";
+  };
+
+in
+
+stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
 
   builder = ./builder.sh;
 
-  patches = [ ./version-test.patch kernel310patch ];
+  patches =
+    [ ./version-test.patch ]
+    ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch;
 
   src =
     if stdenv.system == "i686-linux" then
-- 
cgit 1.4.1