From 7422dcaf192d297c97bfb2aa04991431e29193d0 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Fri, 20 May 2022 13:45:39 +0100
Subject: [PATCH] rust: fix for nix2.8

---
 rust/flake.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/rust/flake.nix b/rust/flake.nix
index 1da168c..02e6059 100644
--- a/rust/flake.nix
+++ b/rust/flake.nix
@@ -11,23 +11,29 @@
   outputs = { self, nixpkgs, utils, naersk, devshell, rust-overlay }:
     utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs { inherit system; };
-        rust = rust-bin.stable.latest.default;
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ (import rust-overlay) ];
+        };
+        rust = pkgs.rust-bin.stable.latest.default;
+        # Override naersk to use our chosen rust version from rust-overlay
         naersk-lib = naersk.lib.${system}.override {
           cargo = rust;
-          rust = rust;
+          rustc = rust;
+        };
+      in rec {
+        packages.default = naersk-lib.buildPackage {
+          pname = "cool-rust-disaster";
+          root = ./.;
         };
-      in {
-        defaultPackage = naersk-lib.buildPackage ./.;
 
-        defaultApp = utils.lib.mkApp { drv = self.defaultPackage."${system}"; };
+        apps.default = utils.lib.mkApp { drv = packages.default; };
 
         # Provide a dev env with rust and rls
         devShell = let
           pkgs = import nixpkgs {
             inherit system;
-
-            overlays = [ devshell.overlay (import rust-overlay) ];
+            overlays = [ devshell.overlay ];
           };
         in pkgs.devshell.mkShell {
           packages = with pkgs; [ (rust.override { extensions = [ "rls" ]; }) ];