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

vim_configurable: fix darwin build with guiSupport #45352

Merged
merged 4 commits into from Aug 28, 2018
Merged

vim_configurable: fix darwin build with guiSupport #45352

merged 4 commits into from Aug 28, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Aug 19, 2018 •
edited

Motivation for this change

Fixes #45025

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)
  • Fits CONTRIBUTING.md.

@LnL7
vim_configurable: fix lua reference
a50807e
@LnL7
vim_configurable: make gtk optional
8a6064a 
Using vim_configurable.override { guiSupport = "no"; } would still pull
in gtk2 as a dependency.
@LnL7
vim_configurable: disable darwinSupport by default
e2ef327 
Using gtk + darwin support seems broken at the moment, we probably want
guiSupport = "carbon" instead but that doesn't work and something like
macvim is probably better for that.  This fixes the build while keeping
guiSupport enabled which might be desirable for eg. +clientserver.

Fixes NixOS#45025
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/79b6s2wql94lwk8dyib2jc4fq8ixl13f-bash-4.4-p23/bin/sh"
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/79b6s2wql94lwk8dyib2jc4fq8ixl13f-bash-4.4-p23/bin/sh"
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/79b6s2wql94lwk8dyib2jc4fq8ixl13f-bash-4.4-p23/bin/sh"
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/79b6s2wql94lwk8dyib2jc4fq8ixl13f-bash-4.4-p23/bin/sh"
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146/bin/.vimtutor-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/79b6s2wql94lwk8dyib2jc4fq8ixl13f-bash-4.4-p23/bin/sh"
head: error writing 'standard output': Broken pipe
checking for references to /build in /nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146...
/nix/store/qjlpi2g5v2sf3ciqffaxvgj1alzfqls0-vim_configurable-8.1.0146

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/x8npv3gr1rq1pf6gqpcdb9b68374pfd6-bash-4.4-p23/bin/sh"
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/x8npv3gr1rq1pf6gqpcdb9b68374pfd6-bash-4.4-p23/bin/sh"
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/x8npv3gr1rq1pf6gqpcdb9b68374pfd6-bash-4.4-p23/bin/sh"
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/x8npv3gr1rq1pf6gqpcdb9b68374pfd6-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/acbsqlqwlslqxxmihvcr2hi6rp07jfjb-python-2.7.15/bin/python"
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/x8npv3gr1rq1pf6gqpcdb9b68374pfd6-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146...
/nix/store/apsv8a0xkp7xq8q6fibxf9qxzry9ykm8-vim_configurable-8.1.0146

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/bin/.vimtutor-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/xkksa1sdiddm4m7hd2mx87acvbs3rzjd-python-2.7.15/bin/python"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/avxlkpsr36xpnsy0byq2c4vxk6sw157a-bash-4.4-p23/bin/sh"
/nix/store/jg4cwxps35rn14540bmddgr7m0cq85xy-vim_configurable-8.1.0146

Mic92
Mic92 reviewed Aug 23, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
@@ -9682,6 +9682,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};

gtk3-x11 = gtk3.override {
x11Support = true;
Copy link
Member

Choose a reason for hiding this comment

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

Can you maybe add a comment that is for macOS where by default gtk3 uses Cocoa (?) instead of x11?

Copy link
Member

Choose a reason for hiding this comment

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

If it's Darwin specific, maybe call it gtk3-darwin or gtk3-cocoa?

Copy link
Member Author

Choose a reason for hiding this comment

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

That sounds confusing. gtk3 uses cocoa by default which makes sense and gtk3-x11 uses x11 everywhere. Using gtk3-x11 on linux doesn't change anything.

Copy link
Member

Choose a reason for hiding this comment

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

I see now. Is it intentional that gtk3 is built without x11 support by default on Darwin? Should we do this also on Linux?

Copy link
Member

Choose a reason for hiding this comment

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

Cocoa/x11 support is probably mutual exclusive - cocoa is preferred as it is the native environment. Building gtk3 without x11 support on linux does not make sense.

Copy link
Member Author

Choose a reason for hiding this comment

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

Exactly, I'm not sure if this broke because of the refactor or a recent update but gui support was disabled or actually didn't work before. I couldn't get Cocoa to work and while gvim with X11 isn't very nice/useful on darwin it does enable +clientserver support.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/6v88ick1cxnn5g91m8qrrqww0lrlr27x-bash-4.4-p23/bin/sh"
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/6v88ick1cxnn5g91m8qrrqww0lrlr27x-bash-4.4-p23/bin/sh"
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/6v88ick1cxnn5g91m8qrrqww0lrlr27x-bash-4.4-p23/bin/sh"
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/6v88ick1cxnn5g91m8qrrqww0lrlr27x-bash-4.4-p23/bin/sh"
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146/bin/.vimtutor-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/6v88ick1cxnn5g91m8qrrqww0lrlr27x-bash-4.4-p23/bin/sh"
head: error writing 'standard output': Broken pipe
checking for references to /build in /nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146...
/nix/store/9gs73x8w1syqrqafi3vibpsdvdwkq8b6-vim_configurable-8.1.0146

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/9hsgp158m12qi4dsvz6x6dxy5rkiind9-bash-4.4-p23/bin/sh"
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/9hsgp158m12qi4dsvz6x6dxy5rkiind9-bash-4.4-p23/bin/sh"
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/9hsgp158m12qi4dsvz6x6dxy5rkiind9-bash-4.4-p23/bin/sh"
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/9hsgp158m12qi4dsvz6x6dxy5rkiind9-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/45d25r4g15j2kmblgyhnd9v03p04fwfg-python-2.7.15/bin/python"
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/9hsgp158m12qi4dsvz6x6dxy5rkiind9-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146...
/nix/store/khgylr5gmp4fq8219c3j37a8zsxpsnsd-vim_configurable-8.1.0146

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: vim_configurable

Partial log (click to expand)

/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/bin/.gvimtutor-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/bin/.vimtutor-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/share/vim/vim81/tools/ref: interpreter directive changed from "/bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
basename: invalid option -- 'w'
Try 'basename --help' for more information.
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/share/vim/vim81/tools/vimm: interpreter directive changed from "/bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/share/vim/vim81/tools/demoserver.py: interpreter directive changed from "/usr/bin/python" to "/nix/store/pscp0gr3ym4h0xrba4wmr2ag3lb4nvjs-python-2.7.15/bin/python"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/share/vim/vim81/tools/vimspell.sh: interpreter directive changed from "/bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146/share/vim/vim81/macros/less.sh: interpreter directive changed from "/bin/sh" to "/nix/store/zbhk0jhc9y8hmbcax9nvddbik3rgsary-bash-4.4-p23/bin/sh"
/nix/store/n389g29bhw3662g23pn73jlyvr09sc6c-vim_configurable-8.1.0146

@LnL7 LnL7 merged commit c66c469 into NixOS:master Aug 28, 2018
@LnL7 LnL7 deleted the darwin-vim-x11 branch August 28, 2018 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@FRidh FRidh FRidh left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: vim 8.has: package (new) 10.rebuild-darwin: 1-10 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
@LnL7 @GrahamcOfBorg @Mic92 @FRidh