colin/fdtd-coremem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runtime fix: update rust-toolchain and EmbarkStudios deps, switch from dylib => lib

Browse Source 
this resolves the issue where Nix builds would segfault when trying to
initialize wgpu -- *possibly* because of multiple dynamically linked
versions of LLVM sitting in the mix (hence, dylib => lib).
This commit is contained in:
colin
2022-07-04 04:25:35 -07:00
parent fa4075818d
commit 1acb4233ae
5 changed files with 50 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Cargo.lock generated
View File

@@ -325,8 +325,8 @@ dependencies = [
"rayon",
"serde",
"spirv-builder",
"spirv-std 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-std",
"spirv-std-macros",
"spirv_backend_lib",
"structopt",
"threadpool",
@@ -1748,7 +1748,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_codegen_spirv"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"ar",
"bimap",
@@ -1758,6 +1758,7 @@ dependencies = [
"num-traits",
"rspirv",
"rustc-demangle",
"rustc_codegen_spirv-types",
"sanitize-filename",
"serde",
"serde_json",
@@ -1766,6 +1767,15 @@ dependencies = [
"syn",
]
[[package]]
name = "rustc_codegen_spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"rspirv",
"serde",
]
[[package]]
name = "rustc_version"
version = "0.4.0"
@@ -1964,26 +1974,16 @@ dependencies = [
[[package]]
name = "spirv-builder"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"memchr",
"raw-string",
"rustc_codegen_spirv",
"rustc_codegen_spirv-types",
"serde",
"serde_json",
]
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"bitflags",
"num-traits",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
]
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
@@ -1992,19 +1992,8 @@ dependencies = [
"bitflags",
"glam",
"num-traits",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
]
[[package]]
name = "spirv-std-macros"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"proc-macro2",
"quote",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"syn",
"spirv-std-macros",
"spirv-types",
]
[[package]]
@@ -2014,33 +2003,28 @@ source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb346
dependencies = [
"proc-macro2",
"quote",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-types",
"syn",
]
[[package]]
name = "spirv-tools"
version = "0.7.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47ffcd721c949125c13b1213a292477a2d82621512b094564bd918c3a1c7f7ff"
checksum = "ca7f0f689581589b0a31000317fa31257cb24d040227708718ebd9fedf5cdd2b"
dependencies = [
"spirv-tools-sys",
]
[[package]]
name = "spirv-tools-sys"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b967db819666ccf7a0373876321bfe852922edcc7f3e30e3a7668b02e1961119"
checksum = "2980b0b4b2a9b5edfeb1dc8a35e84aac07b9c6dcd2339cce004d9355fb62a59d"
dependencies = [
"cc",
]
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
@@ -2050,7 +2034,7 @@ source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb346
name = "spirv_backend_lib"
version = "0.1.0"
dependencies = [
"spirv-std 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-std",
]
[[package]]