From 6ffc2e86150e625266e6836a1404a3e79fc74d49 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 May 2015 05:43:42 +0200
Subject: pkgs: Properly namespace package under "vuizvui".

For packageOverrides, we only want to return the vuizvui attribute set
and nothing more. But if we want to import <vuizvui/pkgs>, we want to
have access to <nixpkgs> as well, which is especially useful when using
the <vuizvui> channel.

However, in callPackageWith we're explicitely using the vuizvui
attribute which should override the whole set of <nixpkgs>, so that
references to vuizvui packages don't need to be explicitly namespaced
within vuizvui itself and we can easily override existing packages with
this method as well (like just define a vuizvui package and it overrides
the dependency for all of vuizvui's packages).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/default.nix')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 576977a4..e8e904ba 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,9 +1,9 @@
 { pkgs ? import (import ../nixpkgs-path.nix) {} }:
 
 let
-  callPackage = pkgs.lib.callPackageWith (pkgs // self);
+  callPackage = pkgs.lib.callPackageWith (pkgs // self.vuizvui);
 
-  self = {
+  self.vuizvui = {
     mkChannel = callPackage ./build-support/channel.nix { };
 
     aacolorize = callPackage ./aacolorize { };
@@ -25,4 +25,4 @@ let
       bfqsched = callPackage ./kpatches/bfqsched.nix { };
     };
   };
-in self
+in pkgs // self
-- 
cgit 1.4.1