Skip to content

vim_configurable: Only run patchelf on gvim if gvim was built #92357

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
Merged
merged 1 commit into from
Jul 6, 2020
Merged

vim_configurable: Only run patchelf on gvim if gvim was built #92357

merged 1 commit into from
Jul 6, 2020
+6 −3

Conversation

bdesham
Copy link
Contributor

@bdesham bdesham commented Jul 5, 2020

Motivation for this change

Previously, the vim_configurable derivation ran patchelf unconditionally on $out/bin/vim and $out/bin/gvim. At some point recently, this started to fail when Vim was being built without GUI support (in which case $out/bin/gvim does not exist). This PR adds a check so that patchelf is not run on gvim unless the file actually exists.

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.

Sorry, something went wrong.

@ofborg ofborg bot added the 6.topic: vim label Jul 5, 2020
@ofborg ofborg bot requested review from lovek323 and equirosa July 5, 2020 18:25
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 5, 2020
@bdesham bdesham force-pushed the vim-configurable-patchelf-fix branch from 0603bba to e45ddb7 Compare July 5, 2020 19:17
equirosa
equirosa approved these changes Jul 5, 2020
View reviewed changes
Copy link
Contributor

@equirosa equirosa left a comment

Choose a reason for hiding this comment

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

  • built on NixOS
  • tested with sandboxing

Sorry, something went wrong.

@ofborg ofborg bot requested a review from equirosa July 5, 2020 19:25
@bhipple
Copy link
Contributor

bhipple commented Jul 6, 2020

Result of nixpkgs-review pr 92357 1

2 packages built:
- vimHugeX (vim_configurable)
- vimacs

@bhipple bhipple merged commit 4130759 into NixOS:master Jul 6, 2020
@doronbehar
Copy link
Contributor

I think my solution was more elegant at https://github.com/NixOS/nixpkgs/pull/91150/files but whatever

@bdesham
Copy link
Contributor Author

bdesham commented Jul 12, 2020

@doronbehar Ah, I hadn’t seen your PR when I created mine 😕 My apologies.

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

@bhipple bhipple

@lovek323 lovek323

@equirosa equirosa

Assignees
No one assigned
Labels
6.topic: vim 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bdesham @bhipple @doronbehar @equirosa