Use nix as the argument name for nix in default.nix

And pass in `nix = nixUnstable` from the development shell.
2022-01-08 08:53:59 +13:00 · 2022-01-08 08:53:59 +13:00 · a0bd67f9cb
parent 44655761c5
commit a0bd67f9cb
2 changed files with 6 additions and 3 deletions
--- 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 = [
--- 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 ++ [