mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
nvidia-x11: Fix building on older kernels
The 3.10 patch breaks building on 3.4 at least.
This commit is contained in:
parent
b9729fb4d4
commit
9f347eba61
@ -8,18 +8,24 @@
|
|||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let versionNumber = "319.32";
|
let
|
||||||
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 {
|
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}"}";
|
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
patches = [ ./version-test.patch kernel310patch ];
|
patches =
|
||||||
|
[ ./version-test.patch ]
|
||||||
|
++ optional (!versionOlder kernelDev.version "3.10") kernel310patch;
|
||||||
|
|
||||||
src =
|
src =
|
||||||
if stdenv.system == "i686-linux" then
|
if stdenv.system == "i686-linux" then
|
||||||
|
Loading…
Reference in New Issue
Block a user