From ed074d07be5dd9233f58821e0ee6e47e237fcdb3 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 17 Dec 2021 20:57:00 -0600
Subject: [PATCH] [nostalgia] Update Dockerfile devenv

---
 Dockerfile           | 17 ++++++++---------
 devenv/entrypoint.sh |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 06cde7fc..40a8cec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,13 @@
-FROM fedora:32
+FROM fedora:35
 
 RUN dnf update -y
 
 ###############################################################################
 # Install gosu
 
-RUN dnf install -y curl gnupg
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64" && \
-    curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64.asc" && \
-    gpg --verify /usr/local/bin/gosu.asc && \
-    rm /usr/local/bin/gosu.asc && \
-    chmod +x /usr/local/bin/gosu
+RUN dnf install -y curl
+RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64"
+RUN chmod +x /usr/local/bin/gosu
 
 ###############################################################################
 # Install dev tools
@@ -26,13 +22,16 @@ RUN dnf install -y git
 RUN dnf install -y vim
 RUN dnf install -y sudo
 RUN dnf install -y fuse-devel
-RUN dnf install -y qt5-devel
 RUN dnf install -y findutils
 RUN dnf install -y ninja-build
 RUN dnf install -y libcxx-devel libcxxabi-devel
 RUN dnf install -y unzip
 RUN dnf install -y ccache
 RUN dnf install -y pacman
+RUN dnf install -y python3-pip
+RUN dnf install -y libglvnd-devel
+RUN dnf install -y gtk3-devel
+RUN pip install conan
 
 ###############################################################################
 # Install devkitARM
diff --git a/devenv/entrypoint.sh b/devenv/entrypoint.sh
index dd85848d..45df381e 100755
--- a/devenv/entrypoint.sh
+++ b/devenv/entrypoint.sh
@@ -20,4 +20,4 @@ if [[ $(id -u user 2> /dev/null) != $USER_ID ]]; then
 	echo "export CXX=/usr/bin/clang++" >> $HOME/.bashrc
 fi
 
-exec /usr/local/bin/gosu user "$@"
+exec "$@"