From af1b9e46ad7417a074432f0cd8e99333d7b9c7a8 Mon Sep 17 00:00:00 2001
From: Paul Bastide <paul.bastide@gmail.com>
Date: Thu, 29 Mar 2018 09:35:00 +0200
Subject: [PATCH 1/2] Try to fix NLopt build on Linux.

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e966b88b1..1f67dfeba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,13 @@ env:
   - DRAW_FIG="false"
 notifications:
   email: false
+## Following 4 lines are taken from here:
+# https://github.com/JuliaOpt/NLopt.jl/blob/master/.travis.yml#L10
+# They're meant to fix the NLopt build on Linux.
+addons:
+    apt: # apt-get for linux
+        packages:
+            - libnlopt0 # We install it this way to be able to run Travis with `sudo: false`
 
 before_install:
 

From 51bf1f07497de606a22eb1431b2a05180865d7be Mon Sep 17 00:00:00 2001
From: Paul Bastide <paul.bastide@gmail.com>
Date: Thu, 29 Mar 2018 09:52:11 +0200
Subject: [PATCH 2/2] Try to use release version of NLopt for osx.

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f67dfeba..f89eff679 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,6 @@ addons:
         packages:
             - libnlopt0 # We install it this way to be able to run Travis with `sudo: false`
 
-before_install:
-
-  # Track master of NLopt. This line should be removed when a a new release of NLopt is out.
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then julia -e 'Pkg.clone("https://github.com/JuliaOpt/NLopt.jl"); Pkg.build("NLopt")'; fi
-
 after_success:
   # push coverage results to Coveralls
   - julia -e 'cd(Pkg.dir("PhyloNetworks")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'