Merge pull request #99254 from Flakebi/amdvlk

amdvlk: 2020.Q3.5 -> 2020.Q3.6
This commit is contained in:
Daniël de Kok 2020-10-01 15:05:00 +02:00 committed by GitHub
commit 4271a89175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "amdvlk"; pname = "amdvlk";
version = "2020.Q3.5"; version = "2020.Q3.6";
src = fetchRepoProject { src = fetchRepoProject {
name = "${pname}-src"; name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}"; rev = "refs/tags/v-${version}";
sha256 = "08fj3cg3axnwadlpfim23g5nyjl69044fqxdr57af6y79441njay"; sha256 = "05bvxxgaz94y85g1sq0jzjxd4j8vgdfan04q2fzmfcw3h6p7syjy";
}; };
buildInputs = [ buildInputs = [
@ -68,11 +68,6 @@ in stdenv.mkDerivation rec {
# LTO is disabled in gcc for i686 as of #66528 # LTO is disabled in gcc for i686 as of #66528
cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"]; cmakeFlags = stdenv.lib.optionals stdenv.is32bit ["-DXGL_ENABLE_LTO=OFF"];
postPatch = stdenv.lib.optionalString stdenv.is32bit ''
substituteInPlace drivers/pal/cmake/PalCompilerOptions.cmake \
--replace "pal_setup_gcc_ipo()" ""
'';
installPhase = '' installPhase = ''
install -Dm755 -t $out/lib icd/amdvlk${suffix}.so install -Dm755 -t $out/lib icd/amdvlk${suffix}.so
install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd${suffix}.json