diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2020-03-01 14:28:57 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 14:28:57 -0300 |
| commit | 74f5358f13f2421335e1dcea472c3a253c3f015d (patch) | |
| tree | 7e983dc7d39fca5a668aedddbe846b07f8a3ee88 /pkgs/os-specific/linux | |
| parent | f0004b41baa68199799b6f1af255c0f41ec65658 (diff) | |
| parent | 3b3876649d963fcc473bae2a04da22a3296ba99a (diff) | |
| download | nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar.gz nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar.bz2 nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar.lz nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar.xz nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.tar.zst nixlib-74f5358f13f2421335e1dcea472c3a253c3f015d.zip | |
Merge pull request #66601 from eadwu/nvidia/prime-render-offload
nvidia: prime render offload
Diffstat (limited to 'pkgs/os-specific/linux')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b4c6952d44d3..30e5d16b60f3 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -75,11 +75,18 @@ installPhase() { fi install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json fi + if [ -e nvidia_layers.json ]; then + sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_layers.json > nvidia_layers.json.fixed + install -Dm644 nvidia_layers.json.fixed $i/share/vulkan/implicit_layer.d/nvidia_layers.json + fi # EGL if [ "$useGLVND" = "1" ]; then sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed + sed -E "s#(libnvidia-egl-wayland)#$i/lib/\\1#" 10_nvidia_wayland.json > 10_nvidia_wayland.json.fixed + install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json + install -Dm644 10_nvidia_wayland.json.fixed $i/share/glvnd/egl_vendor.d/nvidia_wayland.json fi done diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eeb7b99bbaae..9e2ee6e834c2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -32,7 +32,7 @@ let pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; i686bundled = versionAtLeast version "391"; - libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.xorg.libXext pkgs.xorg.libX11 + libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; self = stdenv.mkDerivation { |