make functions no longer require to be ran in root

drawpile · Jan 10, 2024 · 41bbdb5 · 41bbdb5
1 parent f897eae
commit 41bbdb5
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -91,15 +91,24 @@
 
             shellHook = ''
 
+            export ROOT=$PWD
+
             firstBuild() {
-              $configurePhase
-              $buildPhase
-              wrapQtApp Drawpile-build/bin/drawpile
+              cmake -S $ROOT -B $ROOT/Drawpile-build \
+                --preset ${preset} \
+                -DCMAKE_INSTALL_PREFIX=$out
+              cmake --build $ROOT/Drawpile-build
+              wrapQtApp $ROOT/Drawpile-build/bin/drawpile
             }
             
             incrementalBuild() {
-              $buildPhase
-              wrapQtApp Drawpile-build/bin/drawpile
+              cmake --build $ROOT/Drawpile-build
+              wrapQtApp $ROOT/Drawpile-build/bin/drawpile
+            }
+
+            incrementalRun() {
+              incrementalBuild
+              $ROOT/Drawpile-build/bin/drawpile
             }
 
             '';