Skip to content

emacs: Remove clean-env patch and use substituteInPlace#114335

Merged
adisbladis merged 1 commit intoNixOS:masterfrom
adisbladis:emacs-pdump-clean-env
Feb 25, 2021
Merged

emacs: Remove clean-env patch and use substituteInPlace#114335
adisbladis merged 1 commit intoNixOS:masterfrom
adisbladis:emacs-pdump-clean-env

Conversation

@adisbladis
Copy link
Copy Markdown
Member

@adisbladis adisbladis commented Feb 25, 2021

Motivation for this change

This approach applies to all RUN_TEMACS calls and successfully removes -dev paths from the closure and reduces the closure size from ~1.4G to just under ~464M.

It's also less brittle than having in-tree patches.

Closes #98755

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.

cc @edolstra

@ofborg ofborg bot added 6.topic: emacs Text editor 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 25, 2021
@adisbladis adisbladis force-pushed the emacs-pdump-clean-env branch 2 times, most recently from 835cc1e to a551249 Compare February 25, 2021 10:13
@adisbladis adisbladis changed the title emacs: Adapt clean-env patch to pdump emacs: Remove clean-env patch and use substituteInPlace Feb 25, 2021
This approach applies to _all_ RUN_TEMACS calls and successfully removes -dev paths from the closure and reduces the closure size from ~1.4G to just under ~464M.

It's also less brittle than having in-tree patches.
@adisbladis adisbladis merged commit 629d612 into NixOS:master Feb 25, 2021
adisbladis added a commit to nix-community/emacs-overlay that referenced this pull request Feb 25, 2021
This is now fixed upstream in nixpkgs using substituteInPlace which means we don't have to carry patches.
See NixOS/nixpkgs#114335
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: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Emacs has gtk.dev in its closure

2 participants