diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-08-25 09:56:49 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-08-25 10:07:59 +0200 |
commit | cab045f4f50a3e80eedbdf8953e10cd53f029b43 (patch) | |
tree | 603e92b32b80149d9dde9caabe751e7632387288 /modules/user/devhell/profiles/packages.nix | |
parent | 3020154bdfa6c7b4eb0edeae3b2c025a63be34d2 (diff) |
devhell/profiles: Fix package overrides
Regression introduced by 5990a4d62f2d3146ddd03ec2461d45b2102e5f42. In this commit, I copied over the nixpkgs.config.packageOverrides attribute, but didn't trim off the "nixpkgs.config", so the packageOverrides attribute didn't get evaluated correctly. While converting everything to overlays in 0feae9218e6f922366665e6515bc, I noticed that for @devhell's profile the store paths were different. In hindsight, this is pretty obvious given that overrides didn't apply *at* *all* but with the move to nixpkgs.overlays they suddenly applied. So this moves the overrides to overlays instead and drops the override on gnupg, because gnupg is already gnupg21 in upstream <nixpkgs>. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @devhell
Diffstat (limited to 'modules/user/devhell/profiles/packages.nix')
-rw-r--r-- | modules/user/devhell/profiles/packages.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix index faaa5bfd..c8f61ad9 100644 --- a/modules/user/devhell/profiles/packages.nix +++ b/modules/user/devhell/profiles/packages.nix @@ -9,6 +9,17 @@ in { }; config = lib.mkIf cfg.enable { + nixpkgs.overlays = lib.singleton (lib.const (super: { + ncmpcpp = super.ncmpcpp.override { + visualizerSupport = true; + clockSupport = true; + }; + + sox = super.sox.override { + enableLame = true; + }; + })); + nixpkgs.config = { pulseaudio = true; @@ -37,19 +48,6 @@ in { mpv = { youtubeSupport = true; }; - - nixpkgs.config.packageOverrides = super: { - gnupg = super.gnupg21; - - ncmpcpp = super.ncmpcpp.override { - visualizerSupport = true; - clockSupport = true; - }; - - sox = super.sox.override { - enableLame = true; - }; - }; }; environment.systemPackages = with pkgs; [ |