diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-21 19:43:53 +0200 |
| commit | ad47d658d1734353df834a05e45b98dae968550d (patch) | |
| tree | 5ee2481126f5e29cf961e3b955b748609bc08f82 /pkgs/misc/my-env | |
| parent | 8213ff161c461655aaff7d43984384dbca64b312 (diff) | |
| parent | cc218fc91530529b84307faf6fa2dd8c5d395d6f (diff) | |
| download | nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.gz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.bz2 nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.lz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.xz nixlib-ad47d658d1734353df834a05e45b98dae968550d.tar.zst nixlib-ad47d658d1734353df834a05e45b98dae968550d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/my-env')
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index d0b7458bf572..fb8de9b6a71f 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] - , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? "" + , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? "" , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { |