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

dnsmasq: install launchd plist on darwin #23578

Merged
merged 1 commit into from Mar 10, 2017
Merged

Conversation

nicknovitski
Copy link
Contributor

It's just a static file in the contrib folder of the project's source, added as an output in System/Library/LaunchDaemons (I copied this from a few other packages), with its path corrected.

@mention-bot
Copy link

@nicknovitski, thanks for your PR! By analyzing the history of the files in this pull request, we identified @wkennington, @fpletz and @tailhook to be potential reviewers.

@fpletz fpletz added the 6.topic: darwin Running or building packages on Darwin label Mar 7, 2017
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I don't have a Mac so I don't know how this is supposed to work. 😄

@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
# module can create it in Nix-land?
postInstall = ''
install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
'' + optionalString stdenv.isDarwin ''
install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \
$out/System/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure most other packages that have something like this put it in $out/Library/LaunchDaemons

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, you're right, I found two that use Library and only one that used System/Library. Guess I didn't look closely enough the first time. I'll change my patch to match the majority.

@nicknovitski
Copy link
Contributor Author

@LnL7 pointed out most packages put plist files in just $out/Library/LaunchDaemons, so I switched to that.

@nicknovitski
Copy link
Contributor Author

Package ‘xen-4.5.5’ in ‘/home/travis/build/NixOS/nixpkgs/pkgs/applications/virtualization/xen/generic.nix:210’ is not supported on ‘i686-linux’, refusing to evaluate.

The job exceeded the maximum time limit for jobs, and has been terminated.

Well that sucks.

@LnL7
Copy link
Member

LnL7 commented Mar 9, 2017

What's that from?

@nicknovitski
Copy link
Contributor Author

Those seem to be the causes of the current build failures.

@LnL7 LnL7 merged commit 8b7f5e8 into NixOS:master Mar 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants