Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qsyncthingtray: fix program paths #24460

Merged
merged 1 commit into from
Mar 31, 2017
Merged

qsyncthingtray: fix program paths #24460

merged 1 commit into from
Mar 31, 2017

Conversation

peterhoeg
Copy link
Member

Motivation for this change

We need this for qsyncthingtray to be able to detect the processes when the
binaries (syncthing, -inotify and pgrep) are not in the global path.

Any comments @zraexy ?

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@peterhoeg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zraexy to be a potential reviewer.

@Mic92
Copy link
Member

Mic92 commented Mar 30, 2017

merge conflict?

We need this for qsyncthingtray to be able to detect the processes as well.
@peterhoeg
Copy link
Member Author

Thanks for noticing @Mic92.

@Mic92 Mic92 merged commit 880e65e into NixOS:master Mar 31, 2017
@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 1, 2017

I didn't want to step on @zraexy's toes, which is why I didn't merge it straight away, but I guess if he has any issues with the changes, we can always address those. Thanks for your time on this PR, @Mic92 !

@peterhoeg peterhoeg deleted the f/qst branch April 1, 2017 02:09
@peterhoeg peterhoeg restored the f/qst branch April 2, 2017 03:52
@zraexy
Copy link
Member

zraexy commented Apr 2, 2017

@peterhoeg You don't have to worry about my toes. I've been pretty busy so I haven't had a chance to test the changes, but they look fine.

@peterhoeg peterhoeg deleted the f/qst branch April 3, 2017 00:40
@peterhoeg peterhoeg restored the f/qst branch April 3, 2017 02:52
@peterhoeg peterhoeg deleted the f/qst branch April 10, 2017 06:12
@peterhoeg peterhoeg restored the f/qst branch April 10, 2017 11:25
@peterhoeg peterhoeg deleted the f/qst branch April 11, 2017 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants