Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ffcf28a5e3f2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d9c1b2dcabc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2020

  1. nvidia_x11: fix vulkan icd filename

    @eadwu
    eadwu committed Nov 16, 2020
    Copy the full SHA
    0f32240 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #86834 from eadwu/nvidia_x11/fix-vulkan-icd 

    nvidia_x11: fix vulkan icd filename
    @veprbl
    veprbl authored Nov 24, 2020
    Copy the full SHA
    7d9c1b2 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/os-specific/linux/nvidia-x11/builder.sh
8 changes: 7 additions & 1 deletion pkgs/os-specific/linux/nvidia-x11/builder.sh
View file
Original file line number Diff line number Diff line change
@@ -84,8 +84,14 @@ installPhase() {
else
sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
fi
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json

if [ "$system" = "i686-linux" ]; then
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json
else
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json
fi
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