diff options
| -rw-r--r-- | doc/manual/command-ref/nix-env.xml | 2 | ||||
| -rw-r--r-- | mk/programs.mk | 2 | ||||
| -rw-r--r-- | release.nix | 4 | ||||
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index d4563ac47551..eac7739558be 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -456,7 +456,7 @@ $ nix-env -f ~/foo.nix -i '.*'</screen> from another profile: <screen> -$ nix-env -i --from-profile /nix/var/nix/profiles/foo -i gcc</screen> +$ nix-env -i --from-profile /nix/var/nix/profiles/foo gcc</screen> </para> diff --git a/mk/programs.mk b/mk/programs.mk index 3ac64494e3a5..2fbda12bd153 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -51,7 +51,7 @@ define build-program else $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ - install -t $$($(1)_INSTALL_DIR) $$< + install -t $(DESTDIR)$$($(1)_INSTALL_DIR) $$< endif diff --git a/release.nix b/release.nix index 492065df9858..b62ca93a3e31 100644 --- a/release.nix +++ b/release.nix @@ -28,8 +28,8 @@ let configureFlags = "--enable-gc"; postUnpack = '' - (cd source && find . -type f) | cut -c3- > source/.dist-files - cat source/.dist-files + (cd $sourceRoot && find . -type f) | cut -c3- > $sourceRoot/.dist-files + cat $sourceRoot/.dist-files ''; preConfigure = '' diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index f28a52b73ff9..35603af7082a 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -1035,7 +1035,7 @@ static void daemonLoop(char * * argv) }, options); } catch (Interrupted & e) { - throw; + return; } catch (Error & e) { printError(format("error processing connection: %1%") % e.msg()); } |