Fix all packages

kylecarbs · kylecarbs · commit 397e54a0a1ea · 2024-05-06T16:12:43.000-04:00
diff --git a/flake.nix b/flake.nix
@@ -23,7 +23,7 @@
         gdk = pkgs.google-cloud-sdk.withExtraComponents ([pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin]);
 
         # The minimal set of packages to build Coder.
-        devShellPackages = with pkgs; buildPackages ++ [
+        devShellPackages = with pkgs; [
           # google-chrome is not available on OSX
           (if pkgs.stdenv.hostPlatform.isDarwin then null else google-chrome)
           # strace is not available on OSX
@@ -124,14 +124,17 @@
           };
       in
       {
-        defaultPackage = formatter; # or replace it with your desired default package.
         devShell = pkgs.mkShell {
         shellHook = ''
           export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
           export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
         '';
         };
         packages = {
+          all = pkgs.buildEnv {
+            name = "all-packages";
+            paths = devShellPackages;
+          };
           site = buildSite;
 
           # Copying `OS_ARCHES` from the Makefile.
diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -43,9 +43,8 @@ SCRIPT="${BASH_SOURCE[1]:-${BASH_SOURCE[0]}}"
 SCRIPT_DIR="$(realpath "$(dirname "$SCRIPT")")"
 
 function project_root {
-	# If NIX_BUILD_TOP is set, we are in a Nix build and the project root is the
-	# top of the build directory.
-	[[ -n "${NIX_BUILD_TOP:-}" ]] && echo "$src" && return
+	# Nix sets $src in derivations!
+	[[ -n "${src:-}" ]] && echo "$src" && return
 
 	# Try to use `git rev-parse --show-toplevel` to find the project root.
 	# If this directory is not a git repository, this command will fail.
diff --git a/scripts/update-flake.sh b/scripts/update-flake.sh
@@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 OUT=$(mktemp -d -t nar-hash-XXXXXX)
 
-echo "Downloading Go modules..." 
+echo "Downloading Go modules..."
 GOPATH="$OUT" go mod download
 echo "Calculating SRI hash..."
 HASH=$(go run tailscale.com/cmd/nardump --sri "$OUT/pkg/mod/cache/download")
