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: replace 'emacs.nativeComp' in wrapper with 'nativeComp' #107284

Merged
merged 1 commit into from Dec 22, 2020
Merged

emacs: replace 'emacs.nativeComp' in wrapper with 'nativeComp' #107284

merged 1 commit into from Dec 22, 2020

Conversation

r3v2d0g
Copy link
Contributor

@r3v2d0g r3v2d0g commented Dec 20, 2020

Motivation for this change

I was having the following evaluation error since #104010 was merged:

error: --- EvalError ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- nix
at: (106:26) in file: /nix/store/5aigpip3sx9lg5sfzjhsx2xciy143f2p-source/pkgs/build-support/emacs/wrapper.nix

   105|         mkdir -p $out/share/emacs/site-lisp
   106|         ${optionalString emacs.nativeComp ''
      |                          ^
   107|           mkdir -p $out/share/emacs/native-lisp

attribute 'nativeComp' missing

This was due to the use of emacs.nativeComp in one place while nativeComp (set to emacs.nativeComp or false) should have been used, and was actually used everywhere else in the file.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@bqv
Copy link
Contributor

bqv commented Dec 22, 2020

@tadfisher

@tadfisher
Copy link
Contributor

Looks good, thanks for catching this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants