diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-21 01:20:53 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-21 01:20:53 +0000 |
| commit | 5055c595bd08c7aea494767d309645e8f3ef6f3d (patch) | |
| tree | e15710d689799e53633837eea007a3bb2bd814e2 /src/nix | |
| parent | 362ae93851830ecce6ade70462fe991cc522d27b (diff) | |
| parent | 9aae179f34ec2f38167585c07f18a8ab8acefafb (diff) | |
Merge branch 'fix-and-document-addToStoreSlow' of github.com:obsidiansystems/nix into ca-derivation-data-types
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/edit.cc | 1 | ||||
| -rw-r--r-- | src/nix/profile.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nix/edit.cc b/src/nix/edit.cc index dc9775635..378a3739c 100644 --- a/src/nix/edit.cc +++ b/src/nix/edit.cc @@ -45,6 +45,7 @@ struct CmdEdit : InstallableCommand auto args = editorFor(pos); + restoreSignals(); execvp(args.front().c_str(), stringsToCharPtrs(args).data()); std::string command; diff --git a/src/nix/profile.cc b/src/nix/profile.cc index 729924e3a..c6cd88c49 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -395,7 +395,7 @@ struct CmdProfileInfo : virtual EvalCommand, virtual StoreCommand, MixDefaultPro } }; -struct CmdProfileDiffClosures : virtual EvalCommand, virtual StoreCommand, MixDefaultProfile +struct CmdProfileDiffClosures : virtual StoreCommand, MixDefaultProfile { std::string description() override { |