Merge master into staging-next

This commit is contained in:
github-actions[bot] 2020-12-19 12:22:54 +00:00 committed by GitHub
commit b24d59148c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 2 deletions

View file

@ -29,8 +29,12 @@ rec {
}
else legacy_390;
# No active beta right now
beta = stable;
beta = generic {
version = "460.27.04";
sha256_64bit = "plTqtc5QZQwM0f3MeMZV0N5XOiuSXCCDklL/qyy8HM8=";
settingsSha256 = "hU9J0VSrLXs7N14zq6U5LbBLZXEIyTfih/Bj6eFcMf0=";
persistencedSha256 = "PmqhoPskqhJe2FxMrQh9zX1BWQCR2kkfDwvA89+XALA=";
};
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver

View file

@ -0,0 +1,50 @@
{ stdenv, fetchFromGitHub, cmake, python3, git }:
stdenv.mkDerivation rec {
pname = "directx-shader-compiler";
version = "1.5.2010";
# Put headers in dev, there are lot of them which aren't necessary for
# using the compiler binary.
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "microsoft";
repo = "DirectXShaderCompiler";
rev = "v${version}";
sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj";
# We rely on the side effect of leaving the .git directory here for the
# version-grabbing functionality of the build system.
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake git python3 ];
configurePhase = ''
# Requires some additional flags to cmake from a file in the repo
additionalCMakeFlags=$(< utils/cmake-predefined-config-params)
cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}"
cmakeConfigurePhase
'';
# The default install target installs heaps of LLVM stuff.
#
# Upstream issue: https://github.com/microsoft/DirectXShaderCompiler/issues/3276
#
# The following is based on the CI script:
# https://github.com/microsoft/DirectXShaderCompiler/blob/master/appveyor.yml#L63-L66
installPhase = ''
mkdir -p $out/bin $out/lib $dev/include
mv bin/dxc* $out/bin/
mv lib/libdxcompiler.so* $out/lib/
cp -r $src/include/dxc $dev/include/
'';
meta = with stdenv.lib; {
description = "A compiler to compile HLSL programs into DXIL and SPIR-V";
homepage = "https://github.com/microsoft/DirectXShaderCompiler";
platforms = platforms.linux;
license = licenses.ncsa;
maintainers = with maintainers; [ expipiplus1 ];
};
}

View file

@ -17011,6 +17011,8 @@ in
diod = callPackage ../servers/diod { lua = lua5_1; };
directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {};
dkimproxy = callPackage ../servers/mail/dkimproxy { };
do-agent = callPackage ../servers/monitoring/do-agent { };