ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

nvidia-x11.legacy_390: fix bug

Browse Source 
Said bug is described at https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
This commit is contained in:
esthromeris 2023-12-30 08:30:03 +01:00
parent 15e70943fd
commit 50bfc776d4
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -14,6 +14,8 @@ unpackFile() {
buildPhase() { buildPhase() {
runHook preBuild
if [ -n "$bin" ]; then if [ -n "$bin" ]; then
# Create the module. # Create the module.
echo "Building linux driver against kernel: $kernel"; echo "Building linux driver against kernel: $kernel";
@ -23,10 +25,14 @@ buildPhase() {
cd .. cd ..
fi fi
runHook postBuild
} }
installPhase() { installPhase() {
runHook preInstall
# Install libGL and friends. # Install libGL and friends.
# since version 391, 32bit libraries are bundled in the 32/ sub-directory # since version 391, 32bit libraries are bundled in the 32/ sub-directory
@ -214,6 +220,8 @@ installPhase() {
# FIXME: needs PATH and other fixes # FIXME: needs PATH and other fixes
# install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
fi fi
runHook postInstall
} }
genericBuild genericBuild

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

@ -117,6 +117,14 @@ rec {
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
broken = kernel.kernelAtLeast "6.2"; broken = kernel.kernelAtLeast "6.2";
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
}; };
legacy_340 = let legacy_340 = let
@ -153,5 +161,13 @@ rec {
broken = kernel.kernelAtLeast "6.6"; broken = kernel.kernelAtLeast "6.6";
patches = map (patch: "${aurPatches}/${patch}") patchset; patches = map (patch: "${aurPatches}/${patch}") patchset;
# fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
# see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
# and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699
postInstall = ''
mv $out/lib/tls/* $out/lib
rmdir $out/lib/tls
'';
}; };
} }

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

@ -19,10 +19,12 @@
, useFabricmanager ? false , useFabricmanager ? false
, ibtSupport ? false , ibtSupport ? false
, prePatch ? "" , prePatch ? null
, postPatch ? null , postPatch ? null
, patchFlags ? null , patchFlags ? null
, patches ? [ ] , patches ? [ ]
, preInstall ? null
, postInstall ? null
, broken ? false , broken ? false
, brokenOpen ? broken , brokenOpen ? broken
}@args: }@args:
@ -144,6 +146,7 @@ let
patches = if libsOnly then null else patches; patches = if libsOnly then null else patches;
inherit prePatch postPatch patchFlags; inherit prePatch postPatch patchFlags;
inherit preInstall postInstall;
inherit version useGLVND useProfiles; inherit version useGLVND useProfiles;
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
inherit i686bundled; inherit i686bundled;