From ebe19f9ed6bfd555460984b8c7e3252427e5c6ac Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 1 Dec 2022 02:48:39 +0100
Subject: flake: make default combined package with everything inside

---
 flake.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4c7164b..cd54fff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,23 +56,21 @@
     };
 
     packages = rec {
-      website-public = compileQuarto "STRIP_SOLUTIONS=1";
-      website-private = compileQuarto "";
-      website = runCommand "website-combined" { } ''
-        mkdir -p "$out"
-        cp -r "${website-public}"/* "$out/"
-        mkdir -p "$out/${solutionsSecret}"
-        cp -r "${website-private}"/* "$out/${solutionsSecret}"
-      '';
-
       pdf-slides = compilePandoc ./lectures "beamer" "";
       pdf-exercises = compilePandoc ./exercises "pdf" "STRIP_SOLUTIONS=1";
       pdf-solutions = compilePandoc ./exercises "pdf" "";
-      pdf = runCommand "pdf-combined" { } ''
+
+      website-public = compileQuarto "STRIP_SOLUTIONS=1";
+      website-private = compileQuarto "";
+
+      # Everything combined
+      default = runCommand "combined" { } ''
         mkdir -p "$out"
-        ln -s ${pdf-slides} "$out/slides"
-        ln -s ${pdf-exercises} "$out/exercises"
-        ln -s ${pdf-solutions} "$out/solutions"
+        cp -Lr ${pdf-slides} "$out/slides"
+        cp -Lr ${pdf-exercises} "$out/exercises"
+        cp -Lr ${pdf-solutions} "$out/solutions"
+        cp -Lr ${website-public} "$out/website" --no-preserve=mode
+        cp -Lr ${website-private} "$out/website/${solutionsSecret}"
       '';
     };
 
-- 
cgit v1.2.3