macvim: Always make icons

Closes #10489.
Closes #10491.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb
index 18ba9d338..3795ddc7b 100644
--- a/Library/Formula/macvim.rb
+++ b/Library/Formula/macvim.rb
@@ -5,14 +5,13 @@ class Macvim < Formula
   url 'https://github.com/b4winckler/macvim/tarball/snapshot-64'
   version '7.3-64'
   md5 '5bdc0bc618b3179130f846f8d0f81283'
+
   head 'https://github.com/b4winckler/macvim.git', :branch => 'master'
 
   def options
   [
-    # Building custom icons fails for many users, so off by default.
     ["--custom-icons", "Try to generate custom document icons."],
     ["--with-cscope", "Build with Cscope support."],
-    ["--with-envycoder", "Build with Envy Code R Bold font."],
     ["--override-system-vim", "Override system vim."],
     ["--enable-clipboard", "Enable System clipboard handling in the terminal."]
   ]
@@ -47,18 +46,14 @@ class Macvim < Formula
 
     system "./configure", *args
 
+    # Building custom icons fails for many users, so off by default.
     unless ARGV.include? "--custom-icons"
       inreplace "src/MacVim/icons/Makefile", "$(MAKE) -C makeicns", ""
       inreplace "src/MacVim/icons/make_icons.py", "dont_create = False", "dont_create = True"
     end
 
-    # TODO: This seems to be different in snapshot-62
-    unless ARGV.include? "--with-envycoder"
-      # Remove the font from the build dependencies
-      inreplace "src/MacVim/icons/Makefile",
-        '$(OUTDIR)/MacVim-generic.icns: make_icons.py vim-noshadow-512.png loadfont.so Envy\ Code\ R\ Bold.ttf',
-        "$(OUTDIR)/MacVim-generic.icns: make_icons.py vim-noshadow-512.png loadfont.so"
-    end
+    # Reference: https://github.com/b4winckler/macvim/wiki/building
+    system "cd src/MacVim/icons && make getenvy"
 
     system "make"