From 012fc8e4f399af06ab013ba136fe1d2cffb913f1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Mar 2015 18:30:42 +0100 Subject: Refactor overrides into my base profile. Just moving the overrides into the base profile isn't enough here, as we wouldn't be able to refer to packages anymore, because the global nixpkgs.config override is now gone. Instead, we're now putting pkgs.vuizvui.* into the NixOS module system by a new profiles/common.nix, which is used unconditionally for all machines. Of course, the result of this is that we now need to change all references to vuizvui-related packages, which also is a good thing, because we will no longer shadow existing packages from upstream nixpkgs. Signed-off-by: aszlig --- modules/profiles/common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 modules/profiles/common.nix (limited to 'modules/profiles/common.nix') diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix new file mode 100644 index 00000000..21a22358 --- /dev/null +++ b/modules/profiles/common.nix @@ -0,0 +1,11 @@ +{ config, ... }: + +{ + nixpkgs.config.packageOverrides = pkgs: { + vuizvui = 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; + }; + }; +} -- cgit 1.4.1