diff --git a/base/desktop.Dockerfile b/base/desktop.Dockerfile index 8ee8b44..abd817b 100644 --- a/base/desktop.Dockerfile +++ b/base/desktop.Dockerfile @@ -6,7 +6,7 @@ FROM greyltc/archlinux-aur:paru as osicstacks-base-desktop RUN pacman -Syuq --noconfirm # Install packages -RUN aur-install sudo git git-lfs python python-pip python-pipx xz gnu-free-fonts vim ngspice gedit jupyter-notebook xterm +RUN aur-install sudo git git-lfs python python-pip python-pipx xz gnu-free-fonts vim ngspice gedit jupyter-notebook xterm wget ENV TERM=xterm EDITOR=gedit # Clean cache diff --git a/stacks/chipathon-tools/scripts/patch-open-pdks-gf180.sh b/stacks/chipathon-tools/scripts/patch-open-pdks-gf180.sh index 1ab4e1d..5db3596 100644 --- a/stacks/chipathon-tools/scripts/patch-open-pdks-gf180.sh +++ b/stacks/chipathon-tools/scripts/patch-open-pdks-gf180.sh @@ -1,12 +1,6 @@ #!/bin/bash set -ex -function _arch_setup() { - sudo aur-install wget gedit xterm gvim - pip install docopt --upgrade --break-system-packages -} - - function _gf180mcuD_clean_install() { # Re-installs gf180mcuD @@ -170,5 +164,5 @@ function gf180_patch() { source ./global-variables.sh #_gf180mcuD_clean_install -_arch_setup +pip install docopt --upgrade --break-system-packages gf180_patch diff --git a/stacks/chipathon-tools/scripts/patch-open-pdks-sky130.sh b/stacks/chipathon-tools/scripts/patch-open-pdks-sky130.sh index c4f99f1..e63acb7 100644 --- a/stacks/chipathon-tools/scripts/patch-open-pdks-sky130.sh +++ b/stacks/chipathon-tools/scripts/patch-open-pdks-sky130.sh @@ -60,8 +60,4 @@ if [ -d $SCRIPT_DIR/iic-spice-model-red.py ]; then return -1 fi -sudo aur-install wget - -sky130_patch - -sudo aur-install gedit xterm gvim \ No newline at end of file +sky130_patch \ No newline at end of file