build: update deps
without updating, I had an issue with hardware rendering
that made it fall back to slightly stuttery software rendering each time.
no error messages from iced or wgpu,
but I did get the following when running it with mangohud:
shim: Failed to load from "/nix/store/69q712zji0lqph80g6k75z6d3jhbbmb7-mangohud-0.8.4/lib/mangohud/libMangoHud_opengl.so": /nix/store/57iz36553175g3178pvxjij8z5rcsd4n-glibc-2.42-61/lib/libm.so.6: version `GLIBC_2.44' not found (required by /nix/store/69q712zji0lqph80g6k75z6d3jhbbmb7-mangohud-0.8.4/lib/mangohud/libMangoHud_opengl.so)
shim: Failed to load from ${ORIGIN}/libMangoHud_opengl.so: /nix/store/57iz36553175g3178pvxjij8z5rcsd4n-glibc-2.42-61/lib/libm.so.6: version `GLIBC_2.44' not found (required by /nix/store/69q712zji0lqph80g6k75z6d3jhbbmb7-mangohud-0.8.4/lib/mangohud/libMangoHud_opengl.so)
This commit is contained in:
parent
f4241b9711
commit
903dd4994c
4 changed files with 790 additions and 965 deletions
1702
Cargo.lock
generated
1702
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
23
flake.lock
generated
23
flake.lock
generated
|
|
@ -2,11 +2,11 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1781825982,
|
"lastModified": 1790899423,
|
||||||
"narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=",
|
"narHash": "sha256-THGtz65UGJU+sonZidRboyCMk+9DclpMF7pwL4uDV4M=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
|
"rev": "47b6b27ed9a3a9181415e4367d0c30ab2a0e0250",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -35,18 +35,15 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1782175435,
|
"lastModified": 1791260994,
|
||||||
"narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
|
"narHash": "sha256-MFBjw66d4h06MvpW6lIl7RwarLteD0sk859CncGwb1Q=",
|
||||||
"owner": "nixos",
|
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
|
||||||
"repo": "nixpkgs",
|
"type": "tarball",
|
||||||
"rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1086391.151fa4e8ddfd/nixexprs.tar.zst?lastModified=1791260994&rev=151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4"
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"type": "tarball",
|
||||||
"ref": "nixpkgs-unstable",
|
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst";
|
||||||
|
|
||||||
crane.url = "github:ipetkov/crane";
|
crane.url = "github:ipetkov/crane";
|
||||||
|
|
||||||
|
|
|
||||||
14
src/main.rs
14
src/main.rs
|
|
@ -7,7 +7,7 @@ use std::{
|
||||||
};
|
};
|
||||||
|
|
||||||
use iced::{
|
use iced::{
|
||||||
Alignment, Color, Element, Length, Renderer, Subscription, Task, Theme, clipboard, event,
|
Alignment, Color, Length, Renderer, Subscription, Task, Theme, Widget, clipboard, event,
|
||||||
keyboard::{self, Key, key},
|
keyboard::{self, Key, key},
|
||||||
theme, widget, window,
|
theme, widget, window,
|
||||||
};
|
};
|
||||||
|
|
@ -64,7 +64,7 @@ impl State {
|
||||||
|
|
||||||
(state, Task::none())
|
(state, Task::none())
|
||||||
}
|
}
|
||||||
fn view(&self) -> Element<'_, Message, Theme, Renderer> {
|
fn view(&self) -> impl Widget<Message, Theme, Renderer> {
|
||||||
let main = self.image_display.as_ref().map_or_else(
|
let main = self.image_display.as_ref().map_or_else(
|
||||||
|| {
|
|| {
|
||||||
widget::container(widget::text(include_str!("usage.txt")))
|
widget::container(widget::text(include_str!("usage.txt")))
|
||||||
|
|
@ -72,7 +72,7 @@ impl State {
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_x(Alignment::Center)
|
.align_x(Alignment::Center)
|
||||||
.align_y(Alignment::Center)
|
.align_y(Alignment::Center)
|
||||||
.into()
|
.boxed()
|
||||||
},
|
},
|
||||||
|allocation| {
|
|allocation| {
|
||||||
widget::image::viewer(allocation.handle().clone())
|
widget::image::viewer(allocation.handle().clone())
|
||||||
|
|
@ -81,7 +81,7 @@ impl State {
|
||||||
.min_scale(1.)
|
.min_scale(1.)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
.into()
|
.boxed()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -91,7 +91,7 @@ impl State {
|
||||||
widget::container(widget::text(error).style(widget::text::danger))
|
widget::container(widget::text(error).style(widget::text::danger))
|
||||||
.align_x(Alignment::Start)
|
.align_x(Alignment::Start)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.into(),
|
.boxed(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if self.infobar_shown && self.info.is_some() {
|
if self.infobar_shown && self.info.is_some() {
|
||||||
|
|
@ -99,11 +99,11 @@ impl State {
|
||||||
widget::container(widget::text(self.title()))
|
widget::container(widget::text(self.title()))
|
||||||
.align_x(Alignment::End)
|
.align_x(Alignment::End)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.into(),
|
.boxed(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
widget::column([main, widget::row(bar).into()]).into()
|
widget::column([main, widget::row(bar).boxed()])
|
||||||
}
|
}
|
||||||
fn update(&mut self, message: Message) -> Task<Message> {
|
fn update(&mut self, message: Message) -> Task<Message> {
|
||||||
match message {
|
match message {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue