Skip to content
Permalink
Browse files

artiq_flash: resolve openocd symbolic links

On NixOS, openocd may be a symlink in /run/current-system/sw/bin when installed system-wide.
  • Loading branch information...
sbourdeauducq committed Mar 8, 2019
1 parent b2bee3d commit ed2d8dfa7a75513afa4df3ee762782775c137af6
Showing with 2 additions and 2 deletions.
  1. +2 −2 artiq/frontend/artiq_flash.py
@@ -76,15 +76,15 @@ def scripts_path():
if os.name == "nt":
p.insert(0, "Library")
p = os.path.abspath(os.path.join(
os.path.dirname(shutil.which("openocd")),
os.path.dirname(os.path.realpath(shutil.which("openocd"))),
"..", *p))
return p


def proxy_path():
p = ["share", "bscan-spi-bitstreams"]
p = os.path.abspath(os.path.join(
os.path.dirname(shutil.which("openocd")),
os.path.dirname(os.path.realpath(shutil.which("openocd"))),
"..", *p))
return p

0 comments on commit ed2d8df

Please sign in to comment.
You can’t perform that action at this time.