From 51900851c4da921ee41ef15c130b86a0beb9fd75 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sat, 4 Jan 2025 10:26:47 +0300
Subject: [PATCH] nix/shell.nix: add `repo` param, mount links

---
 mmgen/data/version |  2 +-
 nix/shell.nix      | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mmgen/data/version b/mmgen/data/version
index 04b34c4a..4393f464 100644
--- a/mmgen/data/version
+++ b/mmgen/data/version
@@ -1 +1 @@
-15.1.dev9
+15.1.dev10
diff --git a/nix/shell.nix b/nix/shell.nix
index d6e5b55a..14c31f16 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,6 +1,9 @@
 # Nix shell environment for mmgen-wallet
 
-{ add_pkgs_path ? null }:
+{
+    repo ? "mmgen-wallet",
+    add_pkgs_path ? null
+}:
 
 let
     pkgs = import <nixpkgs> {};
@@ -9,23 +12,27 @@ in
 pkgs.mkShellNoCC {
     packages = builtins.attrValues (import ./merged-packages.nix { add_pkgs_path = add_pkgs_path; });
     shellHook = ''
-        do_sudo_override() {
+        do_bin_override() {
             (
                 rm -rf .bin-override
                 mkdir .bin-override
                 cd .bin-override
                 if [ -x /bin/sudo ]; then
                     ln -s /bin/sudo
+                    ln -s /bin/mount
+                    ln -s /bin/umount
                 elif [ -x /run/wrappers/bin/sudo ]; then
                     ln -s /run/wrappers/bin/sudo
+                    ln -s /run/wrappers/bin/mount
+                    ln -s /run/wrappers/bin/umount
                 fi
             )
         }
 
         read _ _ name <<<$(grep ^name setup.cfg)
 
-        [[ "$name" =~ ^mmgen-(wallet|node-tools)$ ]] || {
-            echo "Error: this script must be executed in the mmgen-wallet or mmgen-node-tools repository root"
+        [ "$name" == "${repo}" ] || {
+            echo "Error: this script must be executed in the ${repo} repository root"
             exit 1
         }
 
@@ -33,6 +40,6 @@ pkgs.mkShellNoCC {
         export PYTHONPATH=$pwd
         export PATH=$pwd/cmds:$pwd/.bin-override:$HOME/.local/bin:$PATH
 
-        [ "$UID" == 0 ] || do_sudo_override
+        [ "$UID" == 0 ] || do_bin_override
     '';
 }