Skip to content

Commit 10a527c

Browse files
committed
Fix #1587: the option `shell.buildInputs' does not exist ...
@hamishmack wrote: > I think we need to add the following to the module in [shell.nix](https://github.com/input-output-hk/haskell.nix/blob/master/modules/shell.nix): > * From [`pkgs.mkShell`](https://nixos.org/manual/nixpkgs/stable/#sec-pkgs-mkShell) > * name > * inputsFrom > * shellHook > * From [`mkDerivation`](https://github.com/NixOS/nixpkgs/blob/c3b5e5344d08274212621f8931c7404d4745d3fc/pkgs/stdenv/generic/make-derivation.nix#L89-L156) > * buildInputs > * nativeBuildInputs > * passthru
1 parent c5b6b0c commit 10a527c

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

modules/shell.nix

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,29 @@
4141
type = lib.types.unspecified;
4242
default = projectConfig.crossPlatforms;
4343
};
44+
name = lib.mkOption {
45+
type = lib.types.unspecified;
46+
default = pkgs.mkShell.name;
47+
};
48+
inputsFrom = lib.mkOption {
49+
type = lib.types.unspecified;
50+
default = pkgs.mkShell.inputsFrom;
51+
};
52+
shellHook = lib.mkOption {
53+
type = lib.types.unspecified;
54+
default = pkgs.mkShell.shellHook;
55+
};
56+
buildInputs = lib.mkOption {
57+
type = lib.types.unspecified;
58+
default = mkDerivation.buildInputs;
59+
};
60+
nativeBuildInputs = lib.mkOption {
61+
type = lib.types.unspecified;
62+
default = mkDerivation.nativeBuildInputs;
63+
};
64+
passthru = lib.mkOption {
65+
type = lib.types.unspecified;
66+
default = mkDerivation.passthru;
67+
};
4468
};
4569
}

0 commit comments

Comments
 (0)