From 090f904d132fd2d131ff59d33236915cc34e51d0 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Wed, 22 Sep 2021 20:40:52 +0200
Subject: [PATCH] seth/dapp --use: look for systemwide solc installs

---
 src/dapp/CHANGELOG.md            | 1 +
 src/dapp/libexec/dapp/dapp---use | 2 +-
 src/seth/CHANGELOG.md            | 1 +
 src/seth/libexec/seth/seth---use | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/dapp/CHANGELOG.md b/src/dapp/CHANGELOG.md
index f562141ce..2de58692a 100644
--- a/src/dapp/CHANGELOG.md
+++ b/src/dapp/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Dapp can correctly parse replay strings from invariant tests
 - Libraries are properly linked when compiling with solc >= 0.7
+- `dapp --use` will now find solc versions that have been installed systemwide on nixos
 
 ## [0.34.1] - 2021-09-08
 
diff --git a/src/dapp/libexec/dapp/dapp---use b/src/dapp/libexec/dapp/dapp---use
index 92fe8da99..83488fd44 100755
--- a/src/dapp/libexec/dapp/dapp---use
+++ b/src/dapp/libexec/dapp/dapp---use
@@ -13,7 +13,7 @@ function usage() {
 [[ "$#" -gt 0 ]] || usage
 
 query() {
-  nix-env -q --installed --out-path --no-name "$1" 2>/dev/null
+  nix-store -q --requisites /run/current-system ~/.nix-profile | grep "$1" --color=never 2>/dev/null
 }
 
 shopt -s extglob
diff --git a/src/seth/CHANGELOG.md b/src/seth/CHANGELOG.md
index b2c265be2..e915e18a3 100644
--- a/src/seth/CHANGELOG.md
+++ b/src/seth/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 Contract creations with Dynamic fee transactions.
+- `seth --use` will now find solc versions that have been installed systemwide on nixos
 
 
 ### Changed
diff --git a/src/seth/libexec/seth/seth---use b/src/seth/libexec/seth/seth---use
index 4c8d91980..412a8e979 100755
--- a/src/seth/libexec/seth/seth---use
+++ b/src/seth/libexec/seth/seth---use
@@ -13,7 +13,7 @@ function usage() {
 [[ "$#" -gt 0 ]] || usage
 
 query() {
-  nix-env -q --installed --out-path --no-name "$1" 2>/dev/null
+  nix-store -q --requisites /run/current-system ~/.nix-profile | grep "$1" --color=never 2>/dev/null
 }
 
 shopt -s extglob