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

nvidia_x11: mark broken

Browse Source
This commit is contained in:
PedroHLC ☭ 2022-08-24 16:21:07 -03:00
parent 29c68b0600
commit 27d72f5abb
No known key found for this signature in database
GPG Key ID: F5BFC029DA9A28CE
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@ let
kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
kernelModVersion = lib.versions.majorMinor kernel.modDirVersion;
selectHighestVersion = a: b: if lib.versionOlder a.version b.version
then b
else a;
@ -30,6 +32,8 @@ rec {
openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
brokenOpen = kernelModVersion == "5.4" && kernel.isHardened;
};
latest = selectHighestVersion production (generic {
@ -58,6 +62,8 @@ rec {
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
broken = kernelModVersion == "5.4" && kernel.isHardened;
};
# Update note:
@ -84,7 +90,7 @@ rec {
patches =
let patch390 = o:
(lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch {
(lib.optional (kernelModVersion == o.version) (fetchpatch {
inherit (o) sha256;
url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch";
}));

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

@ -15,6 +15,7 @@
, prePatch ? ""
, patches ? []
, broken ? false
, brokenOpen ? broken
}@args:
{ lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl
@ -104,8 +105,9 @@ let
passthru = {
open = mapNullable (hash: callPackage ./open.nix {
inherit hash broken;
inherit hash;
nvidia_x11 = self;
broken = brokenOpen;
}) openSha256;
settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
withGtk2 = preferGtk2;