Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 7bb5ddbe15be
Choose a base ref
...
head repository: NixOS/nix
compare: 335504a58eb8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 9, 2019

  1. Make nix-daemon.plist less fragile on macOS 

    We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.

That means we're hardcoding something like:

    /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon

That seems unnecessarily fragile.

It might be better to wait4path on the path we intend to call.
    @callahad
    callahad committed Oct 9, 2019
    1
    Copy the full SHA
    8c4a5e7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3133 from callahad/launchd 

    Make nix-daemon.plist less fragile on macOS
    @edolstra
    edolstra committed Oct 9, 2019
    Copy the full SHA
    335504a View commit details
    Browse the repository at this point in the history