the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

add shell.nix argument for nix version

Browse source
This commit is contained in:
Daiderd Jordan 2018-04-04 23:13:56 +02:00
parent 04d0c2f540
commit 38d2fe8672
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shell.nix
View file

@ -1,7 +1,6 @@
{ pkgs ? import ./nix {}, useNix1 ? true }:
let let
pkgs = import ./nix {};
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
phpEnv = stdenv.mkDerivation rec { phpEnv = stdenv.mkDerivation rec {
@ -11,12 +10,12 @@ let
nix-prefetch-git nix-prefetch-git
php php
phpPackages.composer phpPackages.composer
nix
git git
php php
curl curl
bash bash
]; ]
++ stdenv.lib.optional useNix1 nix;
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
@ -32,7 +31,9 @@ let
openssl.dev openssl.dev
pkgconfig pkgconfig
git 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"; HISTFILE = "${toString ./.}/.bash_hist";
passthru.phpEnv = phpEnv; passthru.phpEnv = phpEnv;