Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 10 insertions, 5 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/infra/libkookie/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
index b4401a85d141..7fe1b46e3a55 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix
@@ -5,7 +5,7 @@
 # the `file`
 #
 # This function is used by `dhall-to-nixpkgs` when given a directory
-lib.makeOverridable
+lib.makePackageOverridable
   ( { # Arguments passed through to `buildDhallPackage`
       name
     , dependencies ? []
@@ -14,12 +14,17 @@ lib.makeOverridable
     , src
     , # The file to import, relative to the root directory
       file ? "package.dhall"
+      # Set to `true` to generate documentation for the package
+    , document ? false
     }:
 
-    buildDhallPackage {
-      inherit name dependencies source;
+    buildDhallPackage
+      ( { inherit name dependencies source;
 
-      code = "${src}/${file}";
-    }
+          code = "${src}/${file}";
+
+        }
+      // lib.optionalAttrs document { documentationRoot = src; }
+      )
   )