diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 15:19:09 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 15:19:09 +0200 |
commit | 9844e8b37960d6130d4743674a894dd532936e0e (patch) | |
tree | d980b279cd92b949d746f004e0de8f9d0fc692f5 /bragi.nix | |
parent | 62e5fe4190c17fc7c73de2c42f08eac6e72cc05c (diff) | |
download | nixos-9844e8b37960d6130d4743674a894dd532936e0e.tar nixos-9844e8b37960d6130d4743674a894dd532936e0e.tar.gz nixos-9844e8b37960d6130d4743674a894dd532936e0e.tar.bz2 nixos-9844e8b37960d6130d4743674a894dd532936e0e.tar.xz nixos-9844e8b37960d6130d4743674a894dd532936e0e.zip |
Second attempt at overriding
Diffstat (limited to 'bragi.nix')
-rw-r--r-- | bragi.nix | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -1,15 +1,6 @@ | |||
1 | { config, pkgs, ... }: | 1 | { config, pkgs, ... }: |
2 | 2 | ||
3 | let | 3 | { |
4 | jack2 = pkgs.callPackage ./jack2.nix {}; | ||
5 | pkgs = pkgs.override { | ||
6 | jack2 = jack2; | ||
7 | mpd = pkgs.mpd.override { | ||
8 | jackSupport = true; | ||
9 | jack2 = jack2; | ||
10 | }; | ||
11 | }; | ||
12 | in { | ||
13 | imports = | 4 | imports = |
14 | [ | 5 | [ |
15 | ./bragi-hw.nix | 6 | ./bragi-hw.nix |
@@ -36,6 +27,14 @@ in { | |||
36 | ]; | 27 | ]; |
37 | }; | 28 | }; |
38 | 29 | ||
30 | nixpkgs.config.packageOverrides = pkgs: | ||
31 | { | ||
32 | jack2 = pkgs.callPackage ./jack2.nix {}; | ||
33 | mpd = pkgs.mpd.override { | ||
34 | jackSupport = true; | ||
35 | }; | ||
36 | }; | ||
37 | |||
39 | environment.systemPackages = with pkgs; [ | 38 | environment.systemPackages = with pkgs; [ |
40 | git | 39 | git |
41 | mosh | 40 | mosh |