diff options
| author | David McFarland <corngood@gmail.com> | 2016-10-11 13:50:52 -0300 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2016-11-13 12:44:27 -0400 |
| commit | 6bf27c2caeb621472151c63fc33c4951ce0188d1 (patch) | |
| tree | 21931c608dcbef57d1e34c17983c1e11e071139b /pkgs/os-specific/linux/amdgpu-pro | |
| parent | e783cc90a092768d631559c9ee389269c1daad5e (diff) | |
| download | nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar.gz nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar.bz2 nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar.lz nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar.xz nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.tar.zst nixpkgs-6bf27c2caeb621472151c63fc33c4951ce0188d1.zip | |
vulkan-loader: allow validation layers to be enabled
The loader now uses XDK_DATA_DIRS to find drivers and layers.
Diffstat (limited to 'pkgs/os-specific/linux/amdgpu-pro')
| -rw-r--r-- | pkgs/os-specific/linux/amdgpu-pro/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 17a06664041..856989381ef 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -92,12 +92,13 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -r usr/bin $out/bin + cp -r usr/share $out/share cp -r etc $out/etc + mv $out/etc/vulkan $out/share cp -r usr/include $out/include cp -r usr/lib/${libArch} $out/lib mv $out/lib/amdgpu-pro/* $out/lib/ rmdir $out/lib/amdgpu-pro - cp -r usr/share $out/share '' + optionalString (!libsOnly) '' if [ -d $out/lib/xorg ]; then rm $out/lib/xorg @@ -133,7 +134,7 @@ in stdenv.mkDerivation rec { perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" fi done - substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + substituteInPlace "$out/share/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" ''; buildInputs = [ |