summary refs log tree commit diff
path: root/lib/customisation.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-04-25 07:30:15 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-04-28 05:54:30 -0500
commit901a778c7744b25013168dde1a2a548ad531fd78 (patch)
tree61de39f08c3b3bb4498b252cf068f1ca0f9328de /lib/customisation.nix
parent2716e5bd80878cb5c4cf47ed2424e644dc8a62cf (diff)
downloadnixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar.gz
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar.bz2
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar.lz
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar.xz
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.tar.zst
nixpkgs-901a778c7744b25013168dde1a2a548ad531fd78.zip
makeScope: prevent name collision with makeOverridable
Diffstat (limited to 'lib/customisation.nix')
-rw-r--r--lib/customisation.nix2
1 files changed, 1 insertions, 1 deletions
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;