diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-08-20 13:41:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 13:41:10 -0400 |
| commit | f305b9b0862f28a85a3dcc2a517d4fcb345abc42 (patch) | |
| tree | 4c8a9e95af5d13458bd00e4c11e86e137d8a6bc8 | |
| parent | 203cd959ce865ee97a198d21230180babef33ac3 (diff) | |
| parent | 3cf43547f4be03d1d6eb0bbfc557e2dbc13b4095 (diff) | |
| download | nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar.gz nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar.bz2 nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar.lz nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar.xz nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.tar.zst nixlib-f305b9b0862f28a85a3dcc2a517d4fcb345abc42.zip | |
Merge pull request #45394 from NixOS/makeScope-dry
lib: Use lib.fixed-points.extends to avoid repetition
| -rw-r--r-- | lib/customisation.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 480280428909..0107ed33d9e4 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -195,9 +195,10 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; + # TODO(@Ericson2314): Haromonize argument order of `g` with everything else overrideScope = g: makeScope newScope - (self_: let super = f self_; in super // g super self_); + (lib.fixedPoints.extends (lib.flip g) f); packages = f; }; in self; |