Merge pull request #227546 from expipiplus1/vkd3d

vkd3d and vkd3d-proton: init
This commit is contained in:
Kira Bruneau 2023-04-29 12:22:51 -04:00 committed by GitHub
commit 3b1abb5cfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 0 deletions

View File

@ -0,0 +1,41 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, wine, glslang }:
let
# these are both embedded in the output files
rev = "83308675078e9ea263fa8c37af95afdd15b3ab71";
# git describe --tags
shortRev = builtins.substring 0 8 rev;
realVersion = "v2.8-302-g${shortRev}";
in
stdenv.mkDerivation rec {
pname = "vkd3d-proton";
version = "unstable-2023-04-21";
nativeBuildInputs = [ meson ninja wine glslang ];
src = fetchFromGitHub {
owner = "HansKristian-Work";
repo = pname;
inherit rev;
sha256 = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU=";
fetchSubmodules = true;
};
prePatch = ''
substituteInPlace meson.build \
--replace "vkd3d_build = vcs_tag(" \
"vkd3d_build = vcs_tag( fallback : '${shortRev}'", \
--replace "vkd3d_version = vcs_tag(" \
"vkd3d_version = vcs_tag( fallback : '${realVersion}'",
'';
meta = with lib; {
homepage = "https://github.com/HansKristian-Work/vkd3d-proton";
description =
"A fork of VKD3D, which aims to implement the full Direct3D 12 API on top of Vulkan";
license = licenses.lgpl21;
maintainers = with maintainers; [ expipiplus1 ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison
, vulkan-headers, spirv-headers, vulkan-loader }:
stdenv.mkDerivation rec {
pname = "vkd3d";
version = "1.7";
nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ];
buildInputs = [ vulkan-loader vulkan-headers spirv-headers ];
src = fetchFromGitLab {
domain = "gitlab.winehq.org";
owner = "wine";
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-s5YNA+CjWoYk1tkBYYGfOsI2eXtXPtd1oHVeFFJIWn8=";
};
meta = with lib; {
homepage = "https://gitlab.winehq.org/wine/vkd3d";
description = "A 3D graphics library with an API very similar, but not identical, to Direct3D 12";
license = licenses.lgpl21;
maintainers = with maintainers; [ expipiplus1 ];
platforms = platforms.all;
};
}

View File

@ -24156,6 +24156,10 @@ with pkgs;
hdf5 = hdf5.override { usev110Api = true; };
};
vkd3d = callPackage ../development/libraries/vkd3d {};
vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {};
vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
vkdt = callPackage ../applications/graphics/vkdt { };