From f8dedbb10108898672dce84386b4c9f675c3a82a Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 18:02:28 +0000
Subject: [PATCH] Build aliases based on the previous set including
 all-packages, instead of only using all-packages.

---
 pkgs/top-level/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 0e9f7ecf056f..ae0d38fc7afb 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -126,13 +126,13 @@ let
       selfArgs = topLevelArguments // { inherit pkgsWithOverrides; };
       self = (import ./all-packages.nix selfArgs) self pkgs;
 
-      aliases = import ./aliases.nix self;
+      aliases = super: import ./aliases.nix super;
 
       pkgs_2 = stdenvAdapters;
       pkgs_3 = pkgs_2 // trivialBuilders;
       pkgs_4 = pkgs_3 // stdenvDefault;
       pkgs_5 = pkgs_4 // self;
-      pkgs_6 = pkgs_5 // aliases;
+      pkgs_6 = pkgs_5 // aliases pkgs_5;
 
       pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;