Merge pull request #41810 from ElvishJerricco/fix-aliases-self-refs
Fix aliases.nix using the wrong self refs.
This commit is contained in:
commit
3320b5d1c1
@ -1,4 +1,4 @@
|
||||
self:
|
||||
lib: self: super:
|
||||
|
||||
with self;
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
|
||||
# Make sure that we are not shadowing something from
|
||||
# all-packages.nix.
|
||||
checkInPkgs = n: alias: if builtins.hasAttr n self
|
||||
checkInPkgs = n: alias: if builtins.hasAttr n super
|
||||
then throw "Alias ${n} is still in all-packages.nix"
|
||||
else alias;
|
||||
|
||||
@ -32,7 +32,7 @@ in
|
||||
|
||||
### Deprecated aliases - for backward compatibility
|
||||
|
||||
mapAliases (rec {
|
||||
mapAliases ({
|
||||
PPSSPP = ppsspp; # added 2017-10-01
|
||||
QmidiNet = qmidinet; # added 2016-05-22
|
||||
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
|
||||
|
@ -98,7 +98,7 @@ let
|
||||
in res;
|
||||
|
||||
aliases = self: super: if config.skipAliases or false then {}
|
||||
else import ./aliases.nix super;
|
||||
else import ./aliases.nix lib self super;
|
||||
|
||||
# stdenvOverrides is used to avoid having multiple of versions
|
||||
# of certain dependencies that were used in bootstrapping the
|
||||
|
Loading…
x
Reference in New Issue
Block a user