From d177972e5924f141d62ae26e1c9efb4d1bf8b0b7 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 24 Aug 2022 10:04:02 -0500
Subject: [PATCH] fixing shell.nix

---
 shell.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/shell.nix b/shell.nix
index 7ff80e2..b3d1b84 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
 { pkgs ? import <nixpkgs> { } }:
 with pkgs;
-mkShell {
+mkShell rec {
   name = "presenter-env";
 
   nativeBuildInputs = [
@@ -11,6 +11,7 @@ mkShell {
     extra-cmake-modules
     pkg-config
     libsForQt5.wrapQtAppsHook
+    makeWrapper
     # gccStdenv
     # stdenv
   ];
@@ -32,7 +33,7 @@ mkShell {
     libsForQt5.kcoreaddons
 
     # This is only here because apparently it doesn't pick up the icon theme from the base system
-    papirus-icon-theme
+    # papirus-icon-theme
     # lightly-qt
 
     mpv
@@ -43,6 +44,11 @@ mkShell {
   
   # This creates the proper qt env so that plugins are found right.
   shellHook = ''
+    setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)
+    echo "shellHook: setQtEnvironment = $setQtEnvironment"
+    makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
+    sed "/^exec/d" -i "$setQtEnvironment"
+    source "$setQtEnvironment"
     fish
   '';
 }