From e10d40ef5e19684198754ec6faf5980ad7eab47d Mon Sep 17 00:00:00 2001
From: Astavie <astavie@pm.me>
Date: Mon, 1 May 2023 23:56:49 +0200
Subject: [PATCH] fix: nix flake

* nix flake

* workflow

* remove flake-utils

* update flake

* fix

* remove cargo hash
---
 flake.lock |  8 ++++----
 flake.nix  | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4ee31e4..342e0a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,16 +23,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681759395,
-        "narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=",
+        "lastModified": 1682879489,
+        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50",
+        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 347ec2e..006e5d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,6 @@
 {
-  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11;
+  # 22.11 does not include PR #218472, hence we use the unstable version
+  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
 
   inputs.fenix.url = github:nix-community/fenix;
   inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -27,14 +28,19 @@
           }).buildRustPackage rec {
             pname = "stardust-xr-${name}";
             src = ./.;
-            cargoDepsName = pname;
 
             # ---- START package specific settings ----
-            version = "20230420";
-            cargoSha256 = "sha256-sIs8EKGPTCs+1aOACNB0oHoX/jomjIUBlMeBD0dTJdM=";
+            version = "0.10.2";
+
+            cargoLock = {
+              lockFile = ./Cargo.lock;
+              outputHashes = {
+                "smithay-0.3.0" = "sha256-meEbYmSGQbaSbP5t55R1C/c9KNKvk20wDhPBCsT7kOY=";
+              };
+            };
 
             postPatch = ''
-              sk=/build/${pname}-vendor.tar.gz/stereokit-sys/StereoKit
+              sk=$(echo $cargoDepsCopy/stereokit-sys-*/StereoKit)
               mkdir -p $sk/build/cpm
               cp ${pkgs.fetchurl {
                 url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.32.2/CPM.cmake";