nix: inline source finding in eval-config.nix

Originally, I was thinking every file that needed to operate on the
Spectrum sources would need to import src.nix, but I ended up making
it a global instead.  I think that's nicer to use, but also avoids
re-evaluating the sources for every component in a full build, which I
don't think Nix would memoize due to it being wrapped in a function to
get access to lib (but I didn't test).

Since src.nix therefore shouldn't be accessed anywhere else, it's best
to inline its contents into eval-config.nix, so that it _can't_ be
accessed anywhere else.

Signed-off-by: Alyssa Ross <hi@alyssa.is>

2 files changed, 9 insertions, 15 deletions

diff --git a/nix/eval-config.nix b/nix/eval-config.nix
index 5f4c3fd..78cdeae 100644
--- a/nix/eval-config.nix
+++ b/nix/eval-config.nix
@@ -18,5 +18,13 @@ callback (args // rec {
                      else if builtins.pathExists ../config.nix then import ../config.nix
                      else {});
 
-  src = import ./src.nix { inherit (config.pkgs) lib; };
+  src = with config.pkgs.lib; cleanSourceWith {
+    filter = path: type:
+      path != toString ../Documentation/_site &&
+      path != toString ../Documentation/.jekyll-cache &&
+      path != toString ../Documentation/diagrams/stack.svg &&
+      (type == "file" -> !hasSuffix ".nix" path) &&
+      (type == "directory" -> builtins.baseNameOf path != "build");
+    src = cleanSource ../.;
+  };
 })
diff --git a/nix/src.nix b/nix/src.nix
deleted file mode 100644
index 9c0be2c..0000000
--- a/nix/src.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
-
-{ lib }:
-
-lib.cleanSourceWith {
-  filter = path: type:
-    path != toString ../Documentation/_site &&
-    path != toString ../Documentation/.jekyll-cache &&
-    path != toString ../Documentation/diagrams/stack.svg &&
-    (type == "file" -> !lib.hasSuffix ".nix" path) &&
-    (type == "directory" -> builtins.baseNameOf path != "build");
-  src = lib.cleanSource ../.;
-}