From 901a778c7744b25013168dde1a2a548ad531fd78 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 25 Apr 2017 07:30:15 -0500 Subject: [PATCH] makeScope: prevent name collision with makeOverridable --- lib/customisation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 4853290db54..cf28137cb8a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -177,7 +177,7 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; - override = g: + overrideScope = g: makeScope newScope (self_: let super = f self_; in super // g super self_); packages = f;