diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-17 11:10:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-07-17 11:10:21 +0200 |
| commit | 9f347eba61b2fca5ae5ece21fa74af5d3024bfb3 (patch) | |
| tree | 81d52c3aa372e8d65038f396c37d4129d75e0cdf /pkgs/os-specific/linux/nvidia-x11 | |
| parent | b9729fb4d49f1efb8e39fee83c2f133d30415094 (diff) | |
| download | nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar.gz nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar.bz2 nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar.lz nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar.xz nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.tar.zst nixlib-9f347eba61b2fca5ae5ece21fa74af5d3024bfb3.zip | |
nvidia-x11: Fix building on older kernels
The 3.10 patch breaks building on 3.4 at least.
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 20 |
1 files 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 |