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.

Sign up for GitHub

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: link libXcursor when using lucid toolkit #54916

Merged
merged 1 commit into from Feb 20, 2019
Merged

emacs: link libXcursor when using lucid toolkit #54916

merged 1 commit into from Feb 20, 2019

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Jan 30, 2019

Motivation for this change

(The implementation is) as ugly as it gets but the cursors are pretty. See #51609.

/cc @benley

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

benley
benley approved these changes Jan 30, 2019
View reviewed changes
Copy link
Member

@benley benley left a comment

Choose a reason for hiding this comment

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

if this works correctly then it looks OK to me!

peti
peti requested changes Jan 30, 2019
View reviewed changes
pkgs/applications/editors/emacs/default.nix Outdated Show resolved Hide resolved
@matthewbauer matthewbauer merged commit d6d5795 into NixOS:master Feb 20, 2019
thefloweringash added a commit to thefloweringash/nixpkgs that referenced this pull request Mar 28, 2019
@thefloweringash
emacs: only use patchelf on linux
26e82e6 
This prevents building Emacs with X on Darwin.

Broken by 5af6e9f (NixOS#54916)
@thefloweringash thefloweringash mentioned this pull request Mar 28, 2019
Merged
10 tasks
@pbogdan pbogdan deleted the emacs-xcursor branch December 3, 2019 17:04
@zwizwa
Copy link

zwizwa commented Apr 10, 2022

{ toolkit = "lucid" } is broken in e.g. yesterday's unstable 29abf69 on Linux

the issue seems to be that patchelf is trying to patch the wrapper instead of the elf, and errors out with "patchelf: not an ELF executable"

i don't understand it enough to fix it properly other than adding another hack to make it point to the renamed ELF (why is this suddenly a problem? where does the wrapping actually happen?)

removing the patchelf hack makes it compile again without the Xcursor lib linked in, see:

zwizwa@9c92b35

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti approved these changes

@benley benley benley approved these changes

@chaoflow chaoflow Awaiting requested review from chaoflow

@lovek323 lovek323 Awaiting requested review from lovek323

@jwiegley jwiegley Awaiting requested review from jwiegley

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

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

Successfully merging this pull request may close these issues.

None yet
6 participants
@pbogdan @zwizwa @peti @benley @matthewbauer @GrahamcOfBorg