Download and embed ImageMagick binaries during build

.gitignore

@@ -1,4 +1,5 @@
-.stack-work/
-perspec.cabal
-*~
-Perspec.app
+/.stack-work
+/imagemagick
+/imagemagick.tar.gz
+/Perspec.app
+/perspec.cabal

app/Main.hs

@@ -11,6 +11,8 @@ import Graphics.Gloss
 import Graphics.Gloss.Interface.IO.Game as Gl
 import Graphics.Gloss.Juicy
 import Protolude as P
+import System.Directory
+import System.Environment
 import System.FilePath
 import System.Process
 
@@ -321,9 +323,12 @@ correctAndWrite :: [Text] -> IO ()
 correctAndWrite args = do
   let
     conversionMode = CallConversion
-    -- TODO: Add CLI flag to automatically use local during build
-    convertBin = "convert"  -- global
-    -- convertBin = "./convert"  -- local
+    convertBin = "./imagemagick/bin/convert"
+
+  currentDir <- getCurrentDirectory
+
+  setEnv "MAGICK_HOME" (currentDir ++ "/imagemagick")
+  setEnv "DYLD_LIBRARY_PATH" (currentDir ++ "/imagemagick/lib")
 
   -- TODO: Add CLI flag to switch between them
   case conversionMode of

makefile

@@ -1,4 +1,4 @@
-Perspec.app: ~/.local/bin/perspec
+Perspec.app: ~/.local/bin/perspec imagemagick
 	platypus \
 		--name Perspec \
 		--app-icon images/icon.icns \
@@ -7,6 +7,7 @@ Perspec.app: ~/.local/bin/perspec
 		--author "Adrian Sieber" \
 		--bundled-file ~/.local/bin/perspec \
 		--bundled-file app-aux-files/Credits.html \
+		--bundled-file imagemagick \
 		--bundle-identifier org.adrian.Perspec \
 		--droppable \
 		--optimize-nib \
@@ -16,5 +17,16 @@ Perspec.app: ~/.local/bin/perspec
 		$@
 
 
+imagemagick:
+	rm -f imagemagick.tar.gz
+	curl \
+		https://imagemagick.org/download/binaries/ImageMagick-x86_64-apple-darwin19.2.0.tar.gz \
+		-o imagemagick.tar.gz
+	tar -xf imagemagick.tar.gz
+
+	rm -rf imagemagick
+	mv ImageMagick-7.0.9 imagemagick
+
+
 ~/.local/bin/perspec: app source
 	stack install

package.yaml

@@ -18,6 +18,7 @@ description: |
 
 dependencies:
   - base >= 4.7 && < 5
+  - directory
   - filepath
   - gloss
   - gloss-juicy

readme.md

@@ -15,12 +15,6 @@ Original | In Progress | Corrected
 
 ## Installation
 
-Uses ImageMagick's `convert` command under the hood.
-Check out its
-[installation instructions](https://imagemagick.org/script/download.php)
-to make it available on your system.
-
-
 ### Prebuilt
 
 #### MacOS
@@ -34,6 +28,11 @@ with [Platypus](https://sveinbjorn.org/platypus).
 
 ### From Source
 
+Uses ImageMagick's `convert` command under the hood.
+Check out its
+[installation instructions](https://imagemagick.org/script/download.php)
+to make it available on your system.
+
 Build it from source with Haskell's
 [stack](https://docs.haskellstack.org/en/stable/install_and_upgrade/).