Merge pull request #82 from chanman3388/fix/update-flake-with-rust-ov…

…erlay

Add Rust Overlay to flake to allow for latest stable Rust toolchain

flake.nix

@@ -4,23 +4,28 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     systems,
+    rust-overlay,
     ...
   }: let
     inherit (nixpkgs) lib;
     eachSystem = lib.genAttrs (import systems);
     pkgsFor = eachSystem (system:
       import nixpkgs {
         inherit system;
-        overlays = [self.overlays.default];
+        overlays = [self.overlays.default (import rust-overlay)];
       });
   in {
-    overlays = import ./nix/overlays.nix {inherit self lib;};
+    overlays = import ./nix/overlays.nix {inherit self lib pkgsFor;};
 
     packages = eachSystem (system: {
       default = self.packages.${system}.wpaperd;
@@ -34,6 +39,9 @@
     devShells = eachSystem (system:
       with pkgsFor.${system}; {
         default = mkShell {
+          buildInputs = [
+            rust-bin.stable.latest.default
+          ];
           packages = [
             pkg-config
             wayland

nix/overlays.nix

@@ -1,8 +1,9 @@
 {
   self,
   lib,
+  pkgsFor
 }: let
-  inherit ((builtins.fromTOML (builtins.readFile ../daemon/Cargo.toml)).package) version;
+  inherit ((builtins.fromTOML (builtins.readFile ../daemon/Cargo.toml)).package) version rust-overlay;
 
   mkDate = longDate: (lib.concatStringsSep "-" [
     (builtins.substring 0 4 longDate)
@@ -16,6 +17,12 @@ in {
     in {
       wpaperd = final.callPackage ./default.nix {
         version = "${version}+date=${date}_${self.shortRev or "dirty"}";
+        rustPlatform = let
+          toolchain = pkgsFor.${final.system}.rust-bin.stable.latest.default;
+        in (final.makeRustPlatform {
+            cargo = toolchain;
+            rustc = toolchain;
+          });
       };
     })
   ];