Define {builder,fs}.nix for utils.nix

Re-export everything from utils.nix.

1 files changed, 11 insertions, 11 deletions

diff --git a/utils/default.nix b/utils/default.nix
index df9673daec70..db01702a1fec 100644
--- a/utils/default.nix
+++ b/utils/default.nix
@@ -1,14 +1,14 @@
-{ pkgs, ... }:
+args@{ pkgs, ... }:
 
-# Using this as a library to define some common utility functions that I often
-# reach for.
-{
-  # A unary function that returns its argument.
-  identity = x: x;
+# This top-level module exposes all of my utility functions for Nix. It should
+# be used like:
+# ```nix
+# inherit (briefcase.utils) fs;
+# ```
 
-  # Create a derivation that creates an executable shell script named `as` that
-  # calls the program located at `path`, forwarding all of the arguments.
-  wrapNonNixProgram = { path, as }: pkgs.writeShellScriptBin as ''
-    exec ${path} "$@"
-  '';
+let
+  builder = import ./builder.nix args;
+  fs      = import ./fs.nix args;
+in {
+  inherit builder fs;
 }