Skip to content

Commit

Permalink
inherit in one line
Browse files Browse the repository at this point in the history
  • Loading branch information
albertchae committed Apr 11, 2024
1 parent d865b13 commit 5125a83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkgs/by-name/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
mapAttrs (
_: directory:
if pathExists (directory + "/package.nix")
then callPackage (directory + "/package.nix") { }
then callPackage (directory + "/package.nix") {}
else if pathExists (directory + "/dream2.nix")
then callModule (directory + "/dream2.nix")
else throw "No package.nix or dream2.nix found in ${directory}"
Expand Down
3 changes: 1 addition & 2 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
;


inherit (callPackage ./build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps;
inherit (callPackage ./build-support/node/fetch-pnpm-deps { }) pnpmConfigHook;
inherit (callPackage ./build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps pnpmConfigHook;
atomic-browser = callPackage ./atomic-browser {};
};
in
Expand Down

0 comments on commit 5125a83

Please sign in to comment.