Use nix
as the argument name for nix
in default.nix
And pass in `nix = nixUnstable` from the development shell.
This commit is contained in:
parent
44655761c5
commit
a0bd67f9cb
2 changed files with 6 additions and 3 deletions
|
@ -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 = [
|
||||
|
|
|
@ -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 ++ [
|
||||
|
||||
|
|
Loading…
Reference in a new issue