delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

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

Browse source 
And pass in `nix = nixUnstable` from the development shell.
This commit is contained in:
adisbladis 2022-01-08 08:53:59 +13:00
parent 44655761c5
commit a0bd67f9cb
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -1,6 +1,6 @@
{ stdenv { stdenv
, lib , lib
, nixUnstable , nix
, meson , meson
, cmake , cmake
, ninja , ninja
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = if srcDir == null then filterMesonBuild ./. else srcDir; src = if srcDir == null then filterMesonBuild ./. else srcDir;
buildInputs = [ buildInputs = [
nlohmann_json nlohmann_json
nixUnstable nix
boost boost
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

5
shell.nix
View file

@ -13,7 +13,10 @@
, srcDir ? null , srcDir ? null
}: }:
(pkgs.callPackage ./default.nix { inherit srcDir; }).overrideAttrs (old: { (pkgs.callPackage ./default.nix {
inherit srcDir;
nix = pkgs.nixUnstable;
}).overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [