add shell.nix argument for nix version

NixOS · Apr 11, 2018 · 38d2fe8 · 38d2fe8
1 parent 04d0c2f
commit 38d2fe8
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/shell.nix b/shell.nix
@@ -1,7 +1,6 @@
-let
-  pkgs = import ./nix {};
-
+{ pkgs ? import ./nix {}, useNix1 ? true }:
 
+let
   inherit (pkgs) stdenv;
 
   phpEnv = stdenv.mkDerivation rec {
@@ -11,12 +10,12 @@ let
       nix-prefetch-git
       php
       phpPackages.composer
-      nix
       git
       php
       curl
       bash
-    ];
+    ]
+      ++ stdenv.lib.optional useNix1 nix;
 
     # HISTFILE = "${src}/.bash_hist";
   };
@@ -32,7 +31,9 @@ let
       openssl.dev
       pkgconfig
       git
-    ] ++ (lib.optional stdenv.isDarwin pkgs.darwin.Security);
+    ]
+      ++ stdenv.lib.optional useNix1 nix
+      ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
 
     HISTFILE = "${toString ./.}/.bash_hist";
     passthru.phpEnv = phpEnv;