diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-17 17:48:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 17:48:13 -0400 |
commit | cda7025a710085bfc61e46750859c65f9987d0c8 (patch) | |
tree | 627398933d7386a4deeeb5876571231e094a0ab3 /pkgs/applications/editors | |
parent | 1d7f5073fa4a59df6dc0afeb98bf8c1765d20794 (diff) | |
parent | 7f481e807f0c6dce9a1869ff6c54101340817d6a (diff) | |
download | nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar.gz nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar.bz2 nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar.lz nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar.xz nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.tar.zst nixlib-cda7025a710085bfc61e46750859c65f9987d0c8.zip |
Merge pull request #68528 from lilyball/macvim-ibtool-fix
macvim: work around ibtool issue
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 6081bbc8b0ca..3df964361cc8 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -48,7 +48,11 @@ stdenv.mkDerivation { # The sparkle patch modified the nibs, so we have to recompile them postPatch = '' for nib in MainMenu Preferences; do - /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib + # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking + # and not redirecting screws with subsequent commands. + # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK + # from the fds. + /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null </dev/null done ''; |