diff --git a/lib/builders/build-fds-env.nix b/lib/builders/build-fds-env.nix
index 1eadb314..2a3dcd16 100644
--- a/lib/builders/build-fds-env.nix
+++ b/lib/builders/build-fds-env.nix
@@ -1,8 +1,8 @@
 { buildEnv, extendedStdenv }:
 
-{ paths ? [ ], pathsToLink ? [ ], }@args:
+{ paths ? [ ], pathsToLink ? [ ], ... }@args:
 
 buildEnv (args // {
-  paths = paths ++ [ extendedStdenv ];
-  pathsToLink = pathsToLink ++ [ "/bin" "/etc" "/share" "/lib" ];
+  paths = extendedStdenv ++ paths;
+  pathsToLink = [ "/bin" "/etc" "/share" "/lib" "/libexec" ] ++ pathsToLink;
 })
diff --git a/lib/default.nix b/lib/default.nix
index 4b480f30..7d96389e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -24,8 +24,8 @@ pkgs.lib.makeExtensible
     # extended version of nixpkgs' version that went overboard with
     # developer-oriented dependencies.
     stdenv = with pkgs;
-      [ stdenv direnv cookiecutter oils-for-unix nushell ipcalc ]
-      ++ lib.optional pkgs.isLinux [
+      [ direnv cookiecutter oils-for-unix nushell ipcalc ]
+      ++ lib.optional stdenv.isLinux [
         gdb
         moreutils
         meson
@@ -33,10 +33,13 @@ pkgs.lib.makeExtensible
         pkg-config
         man-pages
         man-pages-posix
-      ];
+      ] ++ (import "${pkgs.path}/pkgs/stdenv/generic/common-path.nix" {
+        inherit pkgs;
+      });
 
-    inherit (self.builders) makeXDGMimeAssociationList
-      makeXDGPortalConfiguration makeXDGDesktopEntry;
+    inherit (self.builders)
+      makeXDGMimeAssociationList makeXDGPortalConfiguration makeXDGDesktopEntry
+      buildHugoSite buildFDSEnv;
     inherit (self.trivial) countAttrs filterAttrs';
     inherit (self.data) importYAML renderTeraTemplate renderMustacheTemplate;
     inherit (self.fetchers) fetchInternetArchive;