JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linuxPackages.nvidia_x11: move patches to specific versions

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-05-31 16:52:03 +03:00
parent 3b4ef34fa0
commit 7b41780a0e
2 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage }:
{ lib, callPackage, fetchurl, fetchpatch }:
let
generic = args: callPackage (import ./generic.nix args) { };
@ -28,6 +28,17 @@ in
settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
useGLVND = false;
patches = [
(fetchpatch {
name = "kernel-4.10.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
})
# from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
# with datestamps removed
./fs52243.patch
];
};
legacy_304 = generic {
@ -38,6 +49,21 @@ in
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;
prePatch = let
debPatches = fetchurl {
url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+ "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
};
prefix = "debian/module/debian/patches";
applyPatches = pnames: if pnames == [] then null else
''
tar xf '${debPatches}'
sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
'';
in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ];
};
legacy_173 = callPackage ./legacy173.nix { };

42
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -6,6 +6,9 @@
, useGLVND ? true
, useProfiles ? true
, preferGtk2 ? false
, prePatch ? ""
, patches ? []
}:
{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
@ -42,43 +45,8 @@ let
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
prePatch = let
debPatches = fetchurl {
url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+ "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
};
prefix = "debian/module/debian/patches";
applyPatches = pnames: if pnames == [] then null else
''
tar xf '${debPatches}'
sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
patches="$patches ${concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
'';
in
# TODO: perhaps other branches also need patching?
if (versionOlder version "340") then applyPatches
[ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ]
else null;
# patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
patches = if libsOnly
then null
else if versionOlder version "340"
then null
else if versionOlder version "375"
then [
(fetchpatch {
name = "kernel-4.10.patch";
url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
})
# from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
# with datestamps removed
./fs52243.patch
]
else null;
patches = if libsOnly then null else patches;
inherit prePatch;
inherit version useGLVND useProfiles;
inherit (stdenv) system;