about summary refs log tree commit diff
path: root/modules/profiles
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-18 18:30:42 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-03-18 18:30:42 +0100
commit012fc8e4f399af06ab013ba136fe1d2cffb913f1 (patch)
tree30067e9c9420fea0a9150234a01bd43208a9d18c /modules/profiles
parent95a16e591e9e26158ebf1604e5cb2c82dfcf2856 (diff)
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/profiles')
-rw-r--r--modules/profiles/common.nix11
1 files changed, 11 insertions, 0 deletions
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;
+    };
+  };
+}