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

emacs: make cairo optional #375289

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Conversation

kilesduli
Copy link
Contributor

@kilesduli kilesduli commented Jan 20, 2025

I noticed that libxft was missing from the buildInputs of make-emacs.nix. After a brief observation, I found that cairo and xft are mutually exclusive options, so I made cairo optional. When withCairo = false; will fallback to xft.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM

@kilesduli kilesduli changed the title emacs: xft now is optional. emacs: cairo now is optional. Jan 21, 2025
@kilesduli kilesduli requested a review from jian-lin January 21, 2025 13:02
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 5001+ labels Jan 21, 2025
@nix-owners nix-owners bot requested review from jwiegley and lovek323 January 21, 2025 14:31
@kilesduli kilesduli requested a review from jian-lin January 21, 2025 14:32
Copy link
Contributor

@jian-lin jian-lin left a comment

Choose a reason for hiding this comment

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

LGTM.

@kilesduli kilesduli changed the base branch from master to staging January 22, 2025 08:21
@kilesduli kilesduli changed the base branch from staging to master January 22, 2025 08:22
@kilesduli kilesduli changed the base branch from master to staging January 22, 2025 08:31
@kilesduli kilesduli requested a review from jian-lin January 22, 2025 11:33
@kilesduli kilesduli changed the title emacs: cairo now is optional. emacs: cairo now is optional Jan 22, 2025
I noticed that libxft was missing from the buildInputs of make-emacs.nix.
After a brief observation, I found that cairo and xft are mutually
exclusive options, so I made cairo optional. When `withCairo = false;`
will fallback to xft.
@kilesduli kilesduli requested a review from jian-lin January 22, 2025 12:21
@kilesduli kilesduli changed the title emacs: cairo now is optional emacs: make cairo optional Jan 22, 2025
@jian-lin jian-lin merged commit f06293e into NixOS:staging Jan 22, 2025
28 of 32 checks passed
@kilesduli kilesduli deleted the emacs-xft-switchs branch January 22, 2025 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: emacs Text editor 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants