From 0c816d7d0261e3c62420108c20e0895adaa26cfa Mon Sep 17 00:00:00 2001
From: Gonzalo Balabasquer <gbalabasquer@gmail.com>
Date: Tue, 16 Feb 2021 12:09:46 -0300
Subject: [PATCH] Fix nix run for Travis (#203)

* Remove solc line from tavis file

* Remove --use flag as solc is overwriten in shell.nix

* Fix shell.nix
---
 .travis.yml | 3 +--
 shell.nix   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06cdcafc..868abd19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ language: nix
 nix: 2.3.6
 before_install:
   - nix-env -iA nixpkgs.cachix
-  - nix-env -f https://github.com/dapphub/dapptools/archive/master.tar.gz -iA solc-static-versions.solc_0_5_12
   - echo "trusted-users = root travis" | sudo tee -a /etc/nix/nix.conf && sudo pkill nix-daemon
   - cachix use maker
 script:
-  - nix-shell --pure --run 'dapp --use solc:0.5.12 test'
+  - nix-shell --pure --run 'dapp test'
diff --git a/shell.nix b/shell.nix
index d5724891..0051c572 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,9 +4,9 @@
 }: with dappPkgs;
 
 mkShell {
+  DAPP_SOLC = solc-static-versions.solc_0_5_12 + "/bin/solc-0.5.12";
+  # SOLC_FLAGS = "--optimize --optimize-runs=200";
   buildInputs = [
-    (dapp.override {
-      solc = solc-static-versions.solc_0_5_12;
-    })
+    dapp
   ];
 }