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

liblogging: add withSystemd option #262840

Merged
1 commit merged into from Nov 2, 2023
Merged

liblogging: add withSystemd option #262840

1 commit merged into from Nov 2, 2023

Conversation

ghost
Copy link

@ghost ghost commented Oct 23, 2023

Description of changes

This allows to build liblogging on platforms where systemd does not compile.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 23, 2023
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config
, systemd ? null
, withSystemd ? true
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
, withSystemd ? true
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd

Copy link
Author

Choose a reason for hiding this comment

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

Thanks! This is one of those patches I'd been carrying since before meta.availableOn existed.

Copy link
Member

Choose a reason for hiding this comment

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

I think you dropped this accidentally

@ghost ghost requested a review from Artturin October 23, 2023 08:51
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin labels Oct 23, 2023
@ghost ghost changed the title liblogging: add withSystemd?true parameter liblogging: add withSystemd parameter Oct 25, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Oct 30, 2023
This allows to build liblogging on platforms where systemd does not
compile.
@Artturin Artturin changed the title liblogging: add withSystemd parameter liblogging: add withSystemd option Oct 31, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin labels Oct 31, 2023
@ghost ghost merged commit 6d2aa33 into NixOS:master Nov 2, 2023
24 of 25 checks passed
@ghost ghost deleted the pr/liblogging/withSystemd branch November 2, 2023 09:23
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant