use stdenv.hostPlatform.system instead of deprecated system

flake.lock

@@ -1,102 +1,41 @@
 {
   "nodes": {
-    "fenix": {
+    "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "naersk",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
       "locked": {
-        "lastModified": 1752475459,
+        "lastModified": 1785541369,
-        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
+        "narHash": "sha256-6VCYI5xashcnAR1lambqt9FGh0F6kYhg1P2Z0VDlr48=",
-        "owner": "nix-community",
+        "owner": "ipetkov",
-        "repo": "fenix",
+        "repo": "crane",
-        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
+        "rev": "508ff4829aefddee8ea62291e86b144b58365724",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "ipetkov",
-        "repo": "fenix",
+        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "fenix": "fenix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752689277,
-        "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nix-filter": {
-      "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1757545623,
+        "lastModified": 1785386831,
-        "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=",
+        "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526",
+        "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.05",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "naersk": "naersk",
+        "crane": "crane",
-        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1752428706,
-        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -2,20 +2,15 @@
   description = "Flake for servicepoint-simulator";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
-    nix-filter.url = "github:numtide/nix-filter";
+    crane.url = "github:ipetkov/crane";
-    naersk = {
-      url = "github:nix-community/naersk";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
-      naersk,
+      crane,
-      nix-filter,
     }:
     let
       lib = nixpkgs.lib;
@@ -40,8 +35,8 @@
         { pkgs, ... }:
         rec {
           servicepoint-simulator = import ./servicepoint-simulator.nix {
-            inherit nix-filter pkgs;
+            inherit pkgs;
-            naersk' = pkgs.callPackage naersk { };
+            craneLib = crane.mkLib pkgs;
           };
           default = servicepoint-simulator;
         }
@@ -52,7 +47,8 @@
       };
 
       overlays.default = final: prev: {
-        servicepoint-simulator = self.legacyPackages."${prev.system}".servicepoint-simulator;
+        servicepoint-simulator =
+          self.legacyPackages."${prev.stdenv.hostPlatform.system}".servicepoint-simulator;
       };
 
       legacyPackages = packages;

servicepoint-simulator.nix

@@ -1,20 +1,10 @@
 {
-  naersk',
+  craneLib,
   pkgs,
-  nix-filter,
 }:
-naersk'.buildPackage rec {
+let
-  src = nix-filter.lib.filter {
+  commonArgs = {
-    root = ./.;
+    src = craneLib.cleanCargoSource ./.;
-    include = [
-      ./Cargo.toml
-      ./Cargo.lock
-      ./src
-      ./Web437_IBM_BIOS.woff
-      ./README.md
-      ./LICENSE
-    ];
-  };
     nativeBuildInputs = with pkgs; [
       pkg-config
       makeWrapper
@@ -51,24 +41,23 @@ naersk'.buildPackage rec {
           wayland
 
           # WINIT_UNIX_BACKEND=x11
-        xorg.libXcursor
+          libxcursor
-        xorg.libXrandr
+          libxrandr
-        xorg.libXi
+          libxi
-        xorg.libX11
+          libx11
-        xorg.libX11.dev
+          libx11.dev
-      ]
-    )
-    ++ lib.optionals pkgs.stdenv.isDarwin (
-      with pkgs.darwin.apple_sdk.frameworks;
-      [
-        Carbon
-        QuartzCore
-        AppKit
         ]
       );
+  };
+in
+craneLib.buildPackage (
+  commonArgs
+  // {
+    cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 
     postInstall = ''
       wrapProgram $out/bin/servicepoint-simulator \
-      --suffix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath buildInputs}
+        --suffix LD_LIBRARY_PATH : ${pkgs.lib.makeLibraryPath commonArgs.buildInputs}
     '';
   }
+)

src/gui_window.rs

@@ -37,7 +37,7 @@ impl GuiWindow {
         }
     }
 
-    pub fn get_buffer(&mut self) -> Buffer<Rc<Window>, Rc<Window>> {
+    pub fn get_buffer(&mut self) -> Buffer<'_, Rc<Window>, Rc<Window>> {
         self.surface.buffer_mut().unwrap()
     }
     pub(crate) fn request_redraw(&self) {