cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #171679 from Flakebi/dxc

Browse source 
directx-shader-compiler: 1.6.2106 -> 1.6.2112
This commit is contained in:
Martin Weinelt 2022-05-25 00:16:19 +02:00 committed by GitHub
commit e641ecb482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/tools/graphics/directx-shader-compiler/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, python3, git }:
{ lib, stdenv, fetchFromGitHub, cmake, ninja, python3, git }:
stdenv.mkDerivation rec {
pname = "directx-shader-compiler";
version = "1.6.2106";
version = "1.6.2112";
# Put headers in dev, there are lot of them which aren't necessary for
# using the compiler binary.
@ -12,20 +12,13 @@ stdenv.mkDerivation rec {
owner = "microsoft";
repo = "DirectXShaderCompiler";
rev = "v${version}";
sha256 = "6kQgAESYiQ06LkiGTfDBYwd/ORLSm1W+BcO+OUp4yXY=";
# We rely on the side effect of leaving the .git directory here for the
# version-grabbing functionality of the build system.
hash = "sha256-+oh7oWJCE0CLehnqpE2J9aIfMFbtfLAKwI9ETmCg/TA=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake git python3 ];
nativeBuildInputs = [ cmake git ninja 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
'';
cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ];
# The default install target installs heaps of LLVM stuff.
#
@ -45,6 +38,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/microsoft/DirectXShaderCompiler";
platforms = with platforms; linux ++ darwin;
license = licenses.ncsa;
maintainers = with maintainers; [ expipiplus1 ];
maintainers = with maintainers; [ expipiplus1 Flakebi ];
};
}