diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-02 13:01:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-02 13:01:43 +0100 |
| commit | 0456a4ec65071a421307d8c98cc95e56c053f7d7 (patch) | |
| tree | 44c67d6957bec75f9a162ff8bd09c08b80052735 /src/nix/shell.cc | |
| parent | ca8caaec5e7581c37b46f79622c81adf52f06314 (diff) | |
| parent | 062012eee15810de522613f1ca3ca9df75fa39e9 (diff) | |
Merge branch 'run-environment' of https://github.com/mkenigs/nix into flakes
Diffstat (limited to 'src/nix/shell.cc')
| -rw-r--r-- | src/nix/shell.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nix/shell.cc b/src/nix/shell.cc index 6fa471dfc..2c5142518 100644 --- a/src/nix/shell.cc +++ b/src/nix/shell.cc @@ -231,7 +231,7 @@ struct Common : InstallableCommand, MixProfile } }; -struct CmdDevShell : Common +struct CmdDevShell : Common, MixEnvironment { std::string description() override { @@ -277,6 +277,8 @@ struct CmdDevShell : Common auto shell = getEnv("SHELL", "bash"); + setEnviron(); + auto args = Strings{baseNameOf(shell), "--rcfile", rcFilePath}; restoreAffinity(); |