Add VkInstance

flake.nix

@@ -1,41 +1,61 @@
 {
-  inputs = {
-    naersk.url = "github:nix-community/naersk/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+  description = "Rust ASH test rust configuration";
 
-    nixpkgs-mozilla = {
-      url = "github:mozilla/nixpkgs-mozilla";
-      flake = false;
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, utils, naersk, nixpkgs-mozilla }:
-    utils.lib.eachDefaultSystem (system:
+  outputs = { self, nixpkgs, flake-utils, rust-overlay }:
+    flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
       let
+        overlays = [ (import rust-overlay) ];
         pkgs = import nixpkgs {
-          inherit system;
-          overlays = [
-            (import nixpkgs-mozilla)
-          ]; 
+          inherit system overlays;
         };
+        rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
-        toolchain = (pkgs.rustChannelOf {
-          rustToolchain = ./rust-toolchain.toml;
-          sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
-        }).rust;
-        
-        naersk-lib = pkgs.callPackage naersk {
-          cargo = toolchain;
-          rustc = toolchain;
-        };
+        rustPlatform = pkgs.recurseIntoAttrs (pkgs.makeRustPlatform {
+          rustc = rust;
+          cargo = rust;
+        });
+
+        libs = with pkgs; [ vulkan-headers vulkan-loader ]
+          ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ libxkbcommon wayland libGL ])
+          ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]);
       in
       {
-        defaultPackage = naersk-lib.buildPackage ./.;
+        devShells = {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              (rust.override { extensions = ["rust-src" "rust-analyzer"]; })
+              pkg-config
+            ];
 
-        devShell = pkgs.mkShell {
-          nativeBuildInputs = [ toolchain ];
+            buildInputs = libs;
+
+            LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (with pkgs; [ libxkbcommon wayland libGL ]);
+          };
         };
-      }
-    );
+
+        packages = {
+          default = rustPlatform.buildRustPackage {
+            pname = "rust_ash_test";
+            version = "0.1.0";
+
+            src = self;
+
+            nativeBuildInputs = with pkgs; [ pkg-config ];
+            buildInputs = libs;
+
+            cargoLock = {
+              lockFile = ./Cargo.lock;
+            };
+          };
+        };
+      });
 }