mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 04:28:40 +03:00
amdvlk: Add i686-linux platform
This commit is contained in:
parent
f73b1097bc
commit
13beb432fb
@ -15,8 +15,11 @@
|
||||
, xorg
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
suffix = if stdenv.system == "x86_64-linux" then "64" else "32";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2020.Q3.4";
|
||||
|
||||
@ -62,14 +65,24 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeDir = "../drivers/xgl";
|
||||
|
||||
# LTO is disabled in gcc for i686 as of #66528
|
||||
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 = ''
|
||||
install -Dm755 -t $out/lib icd/amdvlk64.so
|
||||
install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json
|
||||
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
|
||||
|
||||
substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \
|
||||
substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \
|
||||
"/usr/lib64" "$out/lib"
|
||||
substituteInPlace $out/share/vulkan/icd.d/amd_icd${suffix}.json --replace \
|
||||
"/usr/lib" "$out/lib"
|
||||
|
||||
patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so
|
||||
patchelf --set-rpath "$rpath" $out/lib/amdvlk${suffix}.so
|
||||
'';
|
||||
|
||||
# Keep the rpath, otherwise vulkaninfo and vkcube segfault
|
||||
@ -80,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/GPUOpen-Drivers/AMDVLK";
|
||||
changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ danieldk Flakebi ];
|
||||
};
|
||||
}
|
||||
|
@ -12159,6 +12159,7 @@ in
|
||||
# Multi-arch "drivers" which we want to build for i686.
|
||||
driversi686Linux = recurseIntoAttrs {
|
||||
inherit (pkgsi686Linux)
|
||||
amdvlk
|
||||
mesa
|
||||
vaapiIntel
|
||||
libvdpau-va-gl
|
||||
|
Loading…
Reference in New Issue
Block a user