Skip to content

Update nix to 0.30.1 to fix musl build #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slp merged 1 commit into from
Sep 2, 2025
Merged

Update nix to 0.30.1 to fix musl build #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/muvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ input-linux = { version = "0.7.0", default-features = false, features = [] }
input-linux-sys = { version = "0.9.0", default-features = false, features = [] }
krun-sys = { path = "../krun-sys", version = "1.9.1", default-features = false, features = [] }
log = { version = "0.4.21", default-features = false, features = ["kv"] }
nix = { version = "0.29.0", default-features = false, features = ["event", "fs", "ioctl", "mman", "ptrace", "signal", "socket", "uio", "user"] }
nix = { version = "0.30.0", default-features = false, features = ["event", "fs", "ioctl", "mman", "ptrace", "signal", "socket", "uio", "user"] }
neli = { version = "0.7.0-rc3", default-features = false, features = ["sync"] }
procfs = { version = "0.17.0", default-features = false, features = [] }
rustix = { version = "0.38.34", default-features = false, features = ["fs", "mount", "process", "pty", "std", "stdio", "system", "termios", "use-libc-auxv"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/muvm/src/guest/bridge/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ impl<'a, P: ProtocolHandler> Client<'a, P> {
fn process_vgpu(&mut self) -> Result<bool> {
let mut evt = DrmEvent::default();
// SAFETY: `read` will return a valid DrmEvent
read(self.gpu_ctx.fd.as_raw_fd(), unsafe {
read(self.gpu_ctx.fd.as_fd(), unsafe {
slice::from_raw_parts_mut(
&mut evt as *mut DrmEvent as *mut u8,
mem::size_of::<DrmEvent>(),
Expand Down
10 changes: 5 additions & 5 deletions crates/muvm/src/guest/bridge/x11.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::{HashMap, VecDeque};
use std::ffi::{c_long, c_void, CString};
use std::fs::{read_to_string, remove_file, File};
use std::io::{IoSlice, Write};
use std::os::fd::{AsFd, AsRawFd, FromRawFd, OwnedFd, RawFd};
use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd};
use std::process::exit;
use std::ptr::NonNull;
use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
Expand Down Expand Up @@ -371,7 +371,7 @@ impl X11ProtocolHandler {
}

fn replace_futex_storage(
my_fd: RawFd,
my_fd: BorrowedFd,
pid: Pid,
shmem_path: &str,
shmem_file: &mut File,
Expand All @@ -388,7 +388,7 @@ impl X11ProtocolHandler {
for entry in fs::read_dir(format!("/proc/{pid}/fd"))? {
let entry = entry?;
if let Ok(file) = File::options().open(entry.path()) {
if fstat(file.as_raw_fd())?.st_ino == my_ino {
if fstat(file.as_fd())?.st_ino == my_ino {
fds_to_replace.push(entry.file_name().to_string_lossy().parse::<i32>()?);
}
}
Expand Down Expand Up @@ -457,9 +457,9 @@ impl X11ProtocolHandler {
return Err(Errno::EOPNOTSUPP.into());
} else {
let (fd, shmem_path) = mkstemp(SHM_TEMPLATE)?;
let mut shmem_file = unsafe { File::from_raw_fd(fd) };
let mut shmem_file = File::from(fd);
let ret = Self::replace_futex_storage(
memfd.as_raw_fd(),
memfd.as_fd(),
Pid::from_raw(pid),
shmem_path.as_os_str().to_str().unwrap(),
&mut shmem_file,
Expand Down