From 3c4c467c6a420208efffa47f4b06ef7c73dab58b Mon Sep 17 00:00:00 2001
From: joachimschmidt557 <joachim.schmidt557@outlook.com>
Date: Sun, 10 Oct 2021 10:07:18 +0200
Subject: [PATCH] Update zig devShell

---
 flake.lock  | 16 ++++++++++++++++
 flake.nix   | 41 +++++++++++++++++++++++------------------
 nix/zig.nix | 23 +++++++----------------
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index f2c4b60..5e05462 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1631561581,
+        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1633296426,
@@ -16,6 +31,7 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 2288091..793acff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,24 +1,29 @@
 {
   description = "dotfiles";
 
-  outputs = { self, nixpkgs }:
-    let
-      pkgs = import nixpkgs
-        {
-          system = "x86_64-linux";
-          config = {
-            allowUnfree = true;
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs
+          {
+            system = system;
+            config = {
+              allowUnfree = true;
+            };
+          };
+      in
+      {
+        packages.lutris = pkgs.lutris;
+
+        devShells.zig = import ./nix/zig.nix { pkgs = pkgs; };
+
+        nixosConfigurations = {
+          dustbowl = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [ ./nixos/dustbowl.nix ];
           };
         };
-    in
-    {
-      packages.x86_64-linux.lutris = pkgs.lutris;
-
-      nixosConfigurations = {
-        dustbowl = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [ ./nixos/dustbowl.nix ];
-        };
-      };
-    };
+      });
 }
diff --git a/nix/zig.nix b/nix/zig.nix
index d81e5f8..b015de2 100644
--- a/nix/zig.nix
+++ b/nix/zig.nix
@@ -1,22 +1,13 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs }:
 
-pkgs.stdenv.mkDerivation rec {
-  version = "master";
-  pname = "zig";
-
-  src = ./.;
-
-  hardeningDisable = [ "all" ];
-  nativeBuildInputs = with pkgs; [ cmake ninja ];
+pkgs.mkShell {
   buildInputs = with pkgs; [
-    llvmPackages_12.clang-unwrapped
-    llvmPackages_12.llvm
-    llvmPackages_12.lld
+    cmake
+    ninja
+    llvmPackages_13.clang-unwrapped
+    llvmPackages_13.llvm
+    llvmPackages_13.lld
     libxml2
     zlib
   ];
-
-  preBuild = ''
-    export HOME=$TMPDIR;
-  '';
 }