From a0bd67f9cbdd1ad0c3938b0c626bcf2994731e3a Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 8 Jan 2022 08:53:59 +1300
Subject: [PATCH] Use `nix` as the argument name for `nix` in default.nix

And pass in `nix = nixUnstable` from the development shell.
---
 default.nix | 4 ++--
 shell.nix   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index b052317..1178d04 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, nixUnstable
+, nix
 , meson
 , cmake
 , ninja
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   src = if srcDir == null then filterMesonBuild ./. else srcDir;
   buildInputs = [
     nlohmann_json
-    nixUnstable
+    nix
     boost
   ];
   nativeBuildInputs = [
diff --git a/shell.nix b/shell.nix
index 1def6db..70b4e37 100644
--- a/shell.nix
+++ b/shell.nix
@@ -13,7 +13,10 @@
 , srcDir ? null
 }:
 
-(pkgs.callPackage ./default.nix { inherit srcDir; }).overrideAttrs (old: {
+(pkgs.callPackage ./default.nix {
+  inherit srcDir;
+  nix = pkgs.nixUnstable;
+}).overrideAttrs (old: {
 
   nativeBuildInputs = old.nativeBuildInputs ++ [