diff options
| author | Jack Nagel | 2013-02-28 18:41:44 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-02-28 18:43:13 -0600 |
| commit | 45a497834694b378fa146401ef8f0ae65426afad (patch) | |
| tree | a7da278fda5d3df626c251a7aabe6d01dd631003 /Library/Formula/imagemagick.rb | |
| parent | 48f35a81f47deb51ebc31e59711dc039b369ee37 (diff) | |
| download | homebrew-45a497834694b378fa146401ef8f0ae65426afad.tar.bz2 | |
imagemagick: remove X11.installed? conditionals
Unfortunately this won't work as was probably intended; in order for X11
paths to be injected into the build, an X11 dependency has to be active.
It's not enough for it to simply be installed.
It's possible for things to accidentally find X11 under stdenv, but
superenv actually removes X11 paths unless they are explicitly
requested.
Diffstat (limited to 'Library/Formula/imagemagick.rb')
| -rw-r--r-- | Library/Formula/imagemagick.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index b26d2d0a5..0d81f7211 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -77,8 +77,8 @@ class Imagemagick < Formula args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth args << "--with-rsvg" if build.with? 'rsvg' args << "--without-x" unless build.with? 'x11' - args << "--with-fontconfig=yes" if build.with? 'fontconfig' or MacOS::X11.installed? - args << "--with-freetype=yes" if build.with? 'freetype' or MacOS::X11.installed? + args << "--with-fontconfig=yes" if build.with? 'fontconfig' + args << "--with-freetype=yes" if build.with? 'freetype' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' |