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>

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix
index 21a22358..9b04fb97 100644
--- a/modules/profiles/common.nix
+++ b/modules/profiles/common.nix
@@ -2,10 +2,10 @@
 
 {
   nixpkgs.config.packageOverrides = pkgs: {
-    vuizvui = import ../../pkgs {
+    inherit (import ../../pkgs {
       # We need to make sure to incorporate other package overrides,
       # otherwise we are unable to override packages in vuizvui.*.
       pkgs = pkgs // config.nixpkgs.config.packageOverrides pkgs;
-    };
+    }) vuizvui;
   };
 }
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