tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/Cargo.lock b/Cargo.lock
2index 81c7e20..6ae0a17 100644
3--- a/Cargo.lock
4+++ b/Cargo.lock
5@@ -611,15 +611,6 @@ dependencies = [
6 "error-code",
7 ]
8
9-[[package]]
10-name = "cmake"
11-version = "0.1.54"
12-source = "registry+https://github.com/rust-lang/crates.io-index"
13-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
14-dependencies = [
15- "cc",
16-]
17-
18 [[package]]
19 name = "cobs"
20 version = "0.2.3"
21@@ -3243,12 +3234,6 @@ dependencies = [
22 "windows-sys 0.52.0",
23 ]
24
25-[[package]]
26-name = "rpkg-config"
27-version = "0.1.2"
28-source = "registry+https://github.com/rust-lang/crates.io-index"
29-checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0"
30-
31 [[package]]
32 name = "rustc-demangle"
33 version = "0.1.24"
34@@ -3370,21 +3355,13 @@ version = "1.2.0"
35 source = "registry+https://github.com/rust-lang/crates.io-index"
36 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
37
38-[[package]]
39-name = "sdl3-src"
40-version = "3.2.16"
41-source = "registry+https://github.com/rust-lang/crates.io-index"
42-checksum = "c5b5d192485408fa251477ea1dfb4778d864efaec72f730ce3a753deaffb27bb"
43-
44 [[package]]
45 name = "sdl3-sys"
46 version = "0.5.2+SDL3-3.2.16"
47 source = "registry+https://github.com/rust-lang/crates.io-index"
48 checksum = "f0a31799d7cbd36f2b187c32a56975fbdd371c200a91b01d4ed0faf0012bcf9c"
49 dependencies = [
50- "cmake",
51- "rpkg-config",
52- "sdl3-src",
53+ "pkg-config",
54 ]
55
56 [[package]]
57diff --git a/Cargo.toml b/Cargo.toml
58index 82d8e99..8b15aad 100644
59--- a/Cargo.toml
60+++ b/Cargo.toml
61@@ -18,7 +18,7 @@ serde-big-array = "0.5"
62 eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] }
63 sha2 = "0.10"
64 ab_glyph = "0.2"
65-sdl3-sys = { version = "0.5", features = ["build-from-source-static"] }
66+sdl3-sys = { version = "0.5", features = ["use-pkg-config"] }
67 rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] }
68 tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] }
69 spin_sleep = "1.3"
70diff --git a/build.rs b/build.rs
71index f0c6d21..fa28e25 100644
72--- a/build.rs
73+++ b/build.rs
74@@ -52,10 +52,7 @@ fn main() {
75 .include("parallel-rdp/parallel-rdp-standalone/vulkan")
76 .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
77 .include("parallel-rdp/parallel-rdp-standalone/util")
78- .include(
79- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap())
80- .join("include"),
81- );
82+ ;
83
84 let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
85 let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();