diff options
| author | Florian Klink <flokli@flokli.de> | 2024-04-13T10·43+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2024-04-13T12·01+0000 |
| commit | e5b87d549620a0745eef41afe665218c4c153442 (patch) | |
| tree | 1fc22f0a46ad6f65af994651f6e4506b7100308f | |
| parent | 31e3382129f6a750f2d2eec840cc7bb1c2db80ce (diff) | |
feat(3p/nixpkgs): add additionalOverlays optional arg r/7907
This allows applying additional overlays to nixpkgs before instantiating it. Change-Id: Iee486086e13bb73e6bd20a817b1106c3cd99c935 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11407 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
| -rw-r--r-- | third_party/nixpkgs/default.nix | 5 | ||||
| -rw-r--r-- | tvix/shell.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index ae379a90fa..b79a963e5c 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,6 +13,9 @@ , depotOverlays ? true , localSystem ? externalArgs.localSystem or builtins.currentSystem , crossSystem ? externalArgs.crossSystem or localSystem + # additional overlays to be applied. + # Useful when calling this file in a view exported from depot. +, additionalOverlays ? [ ] , ... }: @@ -69,5 +72,5 @@ import nixpkgsSrc (commonNixpkgsArgs // { depot.third_party.overlays.ecl-static depot.third_party.overlays.dhall (import depot.third_party.sources.rust-overlay) - ] else [ ]); + ] else [ ] ++ additionalOverlays); }) diff --git a/tvix/shell.nix b/tvix/shell.nix index bba20496a7..75e64b88b2 100644 --- a/tvix/shell.nix +++ b/tvix/shell.nix @@ -8,6 +8,7 @@ pkgs ? (import ./nixpkgs { depotOverlays = false; depot.third_party.sources = import ./sources { }; + additionalOverlays = [ ]; }) , ... }: |