From eb71e5be69c7931af6c942ffe09aad1687a938cb Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 10 Jun 2022 20:07:06 +0200
Subject: [PATCH] flake.nix: set openwrt-imagebuilder.input.nixpkgs.follows

---
 flake.lock | 18 +++---------------
 flake.nix  | 11 ++++++++---
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8745983..048f83f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,20 +31,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1651024496,
-        "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "openwrt": {
       "flake": false,
       "locked": {
@@ -64,7 +50,9 @@
     },
     "openwrt-imagebuilder": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1654715602,
diff --git a/flake.nix b/flake.nix
index 629d0ca..115668b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,14 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
     nixpkgs-master.url = "github:NixOS/nixpkgs";
-    openwrt.url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
-    openwrt.flake = false;
-    openwrt-imagebuilder.url = "github:astro/nix-openwrt-imagebuilder";
+    openwrt = {
+      url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
+      flake = false;
+    };
+    openwrt-imagebuilder = {
+      url = "github:astro/nix-openwrt-imagebuilder";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{ self, nixpkgs, nixpkgs-master, openwrt, openwrt-imagebuilder }: