BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #206756 from Ralith/shaderc-2022.4

Browse source 
shaderc: 2021.0 -> 2022.4
This commit is contained in:
Thiago Kenji Okada 2023-01-02 21:26:38 +00:00 committed by GitHub
commit dccf78e57a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/shaderc/default.nix
View file

@ -8,25 +8,25 @@ let
glslang = fetchFromGitHub { glslang = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "glslang"; repo = "glslang";
rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; rev = "728c689574fba7e53305b475cd57f196c1a21226";
sha256 = "sha256-tkWVvYmSpJPaZ8VJOkAWndDWhA0PiHAkR3feBAo+knM="; hash = "sha256-BAgDQosiO3e4yy2DpQ6SjrJNrHTUDSduHFRvzWvd4v0=";
}; };
spirv-tools = fetchFromGitHub { spirv-tools = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Tools"; repo = "SPIRV-Tools";
rev = "c2d5375fa7cc87c93f692e7200d5d974283d4391"; rev = "d9446130d5165f7fafcb3599252a22e264c7d4bd";
sha256 = "sha256-tMJRljrlH+qb+27rTn+3LuEyMOVpiU0zSCiGNfUTb6g="; hash = "sha256-fuYhzfkWXDm1icLHifc32XZCNQ6Dj5f5WJslT2JoMbc=";
}; };
spirv-headers = fetchFromGitHub { spirv-headers = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "SPIRV-Headers"; repo = "SPIRV-Headers";
rev = "0c28b6451d77774912e52949c1e57fa726edf113"; rev = "c214f6f2d1a7253bb0e9f195c2dc5b0659dc99ef";
sha256 = "sha256-KpCMceTV/BRaoJe1qeXhKYQNQqdGaM6Q9nklpJKzHFY="; hash = "sha256-/9EDOiqN6ZzDhRKP/Kv8D/BT2Cs7G8wyzEsGATLpmrA=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "shaderc"; pname = "shaderc";
version = "2021.0"; version = "2022.4";
outputs = [ "out" "lib" "bin" "dev" "static" ]; outputs = [ "out" "lib" "bin" "dev" "static" ];
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "google"; owner = "google";
repo = "shaderc"; repo = "shaderc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-RfSMzrGVtdXbr/mjSrHoN447e3vMQfJbesQMvLOARBs="; hash = "sha256-/p2gJ7Lnh8IfvwBwHPDtmfLJ8j+Rbv+Oxu9lxY6fxfk=";
}; };
patchPhase = '' patchPhase = ''

3
pkgs/development/libraries/libplacebo/default.nix
View file

@ -7,7 +7,6 @@
, vulkan-headers , vulkan-headers
, vulkan-loader , vulkan-loader
, shaderc , shaderc
, glslang
, lcms2 , lcms2
, libepoxy , libepoxy
, libGL , libGL
@ -38,7 +37,6 @@ stdenv.mkDerivation rec {
vulkan-headers vulkan-headers
vulkan-loader vulkan-loader
shaderc shaderc
glslang
lcms2 lcms2
libepoxy libepoxy
libGL libGL
@ -50,6 +48,7 @@ stdenv.mkDerivation rec {
"-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml"
"-Ddemos=false" # Don't build and install the demo programs "-Ddemos=false" # Don't build and install the demo programs
"-Dd3d11=disabled" # Disable the Direct3D 11 based renderer "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer
"-Dglslang=disabled" # rely on shaderc for GLSL compilation instead
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
"-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind`
]; ];