From c300e42ddbfb45779bb79544ba990a9c71092322 Mon Sep 17 00:00:00 2001
From: Anton-4 <17049058+Anton-4@users.noreply.github.com>
Date: Thu, 14 Jul 2022 15:04:11 +0200
Subject: [PATCH] nixos fix glibc2.34 not found

---
 flake.lock | 60 +++++++++---------------------------------------------
 flake.nix  | 21 +++++++++++++++----
 2 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8a7a94946c..57d6bd72d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -47,7 +47,9 @@
     },
     "nixgl": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1654775507,
@@ -64,20 +66,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1655122334,
-        "narHash": "sha256-Rwwvo9TDCH0a4m/Jvoq5wZ3FLSLiVLBD1FFfN/3XawA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e1a1cfb56504d1b82a3953bfb0632b37a1ca8d30",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1647282937,
         "narHash": "sha256-K8Oo6QyFCfiEWTRpQVfzcwI3YNMKlz6Tu8rr+o3rzRQ=",
@@ -93,43 +81,11 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1656401090,
-        "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1631288242,
-        "narHash": "sha256-sXm4KiKs7qSIf5oTAmrlsEvBW193sFj+tKYVirBaXz0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0e24c87754430cb6ad2f8c8c8021b29834a8845e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay",
         "zig": "zig"
       }
@@ -137,7 +93,9 @@
     "rust-overlay": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1656730247,
@@ -156,7 +114,9 @@
     "zig": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1651452199,
diff --git a/flake.nix b/flake.nix
index cdac85072d..5dc70e4f77 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,23 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
-    rust-overlay.url = "github:oxalica/rust-overlay"; # rust from nixpkgs has some libc problems, this is patched in the rust-overlay
-    zig.url = "github:roarkanize/zig-overlay"; # using an overlay allows for quick updates after zig releases
-    flake-utils.url = "github:numtide/flake-utils"; # to easily make configs for multiple architectures
-    nixgl.url = "github:guibou/nixGL"; # to be able to use vulkan system libs for editor graphics
+    # rust from nixpkgs has some libc problems, this is patched in the rust-overlay
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # using an overlay allows for quick updates after zig releases
+    zig = {
+      url = "github:roarkanize/zig-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # to easily make configs for multiple architectures
+    flake-utils.url = "github:numtide/flake-utils";
+    # to be able to use vulkan system libs for editor graphics
+    nixgl = {
+      url = "github:guibou/nixGL";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, rust-overlay, zig, flake-utils, nixgl }: