update dependencies

commonkestrel · Jul 27, 2024 · 7e2509b · 7e2509b
1 parent 126aa5c
commit 7e2509b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ humantime = "2.1"
 lazy-regex = "3.1"
 libloading = "0.8"
 logos = "0.13"
-minifb = "0.27.0"
+minifb = { git = "https://github.com/emoon/rust_minifb", rev = "d62b0f5" }
 modular-bitfield = "0.11"
 once_cell = "1.18"
 serialport = "4.3"

diff --git a/default.nix b/default.nix
@@ -14,20 +14,18 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-910xg3yq5Ne6XhJ71RVqZW2rAdPciYvIv+Zj5KG86Y0=";
   };
 
-  nativeBuildInputs = with pkgs; [
-    pkg-config
-    openssl.dev
-    openssl
-    systemd
-  ];
-
   buildInputs = with pkgs; [
+    pkg-config
     openssl.dev
     openssl
     systemd
-	wayland
-	libGL
-	libxkbcommon
+    wayland
+    libGL
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libXcursor
+    libxkbcommon
   ];
 
   cargoLock = {

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,17 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    openssl.dev
+    openssl
+    systemd
+	wayland
+	libGL
+	pkg-config
+	xorg.libX11
+	xorg.libXrandr
+	xorg.libXi
+	xorg.libXcursor
+	libxkbcommon
+  ];
+}
diff --git a/src/emulator/display.rs b/src/emulator/display.rs
@@ -41,8 +41,8 @@ impl TextBuffer {
 
 async fn run_handle(buffer: BufferPtr) {
     let mut opts = WindowOptions::default();
-    // opts.scale = Scale::FitScreen;
-    opts.scale_mode = ScaleMode::UpperLeft;
+    opts.scale = Scale::FitScreen;
+    opts.scale_mode = ScaleMode::AspectRatioStretch;
     opts.resize = true;
 
     let mut window =