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

Jump to bottom

emacs: Also allow imagemagick dependency when using withNS #64901

Merged
merged 1 commit into from Jul 17, 2019
Merged

emacs: Also allow imagemagick dependency when using withNS #64901

merged 1 commit into from Jul 17, 2019

Conversation

dgchurchill
Copy link
Contributor

Motivation for this change

This allows Emacs to be used with imagemagick on macOS.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dgchurchill
emacs: Also allow imagemagick dependency when using withNS
9339970 
This allows Emacs to be used with imagemagick on macOS.
@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/nixos-stable-emacs-imagemagick-support/1338/19

@matthewbauer
Copy link
Member

Does (image-type-available-p 'imagemagick) work correctly? I'm getting nil even on X11/Linux right now, not sure why though.

@dgchurchill
Copy link
Contributor Author

I haven’t tested on Linux but (image-type-available-p ‘imagemagick) does return t on macOS with this change. In case you’re not aware note that you also have to add an override or overlay that passes the imagemagick derivation in. The definition of emacs in all-packages.nix has imagemagick = null.

@matthewbauer matthewbauer merged commit 2255f29 into NixOS:master Jul 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwiegley jwiegley Awaiting requested review from jwiegley

@the-kenny the-kenny Awaiting requested review from the-kenny

@peti peti Awaiting requested review from peti

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees
No one assigned
Labels
6.topic: emacs 10.rebuild-darwin: 11-100 10.rebuild-linux: 0 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dgchurchill @nixos-discourse @matthewbauer @Janik-Haag