diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 13:27:57 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 13:27:57 +0200 |
commit | 1f314278629729fe6ece82dae26d3a405639bcae (patch) | |
tree | 63ab632740933112ebfcc4493869b2b0ed2b6bc4 | |
parent | f6a149303988c53b65d3e4a27b4715bcb6644ae7 (diff) | |
download | utils-1f314278629729fe6ece82dae26d3a405639bcae.tar utils-1f314278629729fe6ece82dae26d3a405639bcae.tar.gz utils-1f314278629729fe6ece82dae26d3a405639bcae.tar.bz2 utils-1f314278629729fe6ece82dae26d3a405639bcae.tar.xz utils-1f314278629729fe6ece82dae26d3a405639bcae.zip |
use nixpkgs overlays
-rw-r--r-- | nix/default.nix | 20 | ||||
-rw-r--r-- | nix/module.nix | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/nix/default.nix b/nix/default.nix index 147aed1..dc225a3 100644 --- a/nix/default.nix +++ b/nix/default.nix | |||
@@ -1,13 +1,9 @@ | |||
1 | pkgs: | 1 | self: super: |
2 | 2 | ||
3 | let | 3 | { |
4 | callPackage = pkgs.lib.callPackageWith (pkgs // self); | 4 | cliparg = self.callPackage ./cliparg.nix {}; |
5 | 5 | rebuild-system = self.callPackage ./rebuild-system.nix {}; | |
6 | self = { | 6 | pulseaudio-ctl = self.callPackage ./pulseaudio-ctl.nix {}; |
7 | cliparg = callPackage ./cliparg.nix {}; | 7 | monitor-uucp = self.callPackage ./monitor-uucp.nix {}; |
8 | rebuild-system = callPackage ./rebuild-system.nix {}; | 8 | rolling-directory = self.callPackage ./rolling-directory.nix {}; |
9 | pulseaudio-ctl = callPackage ./pulseaudio-ctl.nix {}; | 9 | } |
10 | monitor-uucp = callPackage ./monitor-uucp.nix {}; | ||
11 | rolling-directory = callPackage ./rolling-directory.nix {}; | ||
12 | }; | ||
13 | in self | ||
diff --git a/nix/module.nix b/nix/module.nix index 7d47e1a..123910a 100644 --- a/nix/module.nix +++ b/nix/module.nix | |||
@@ -48,7 +48,7 @@ in { | |||
48 | }; | 48 | }; |
49 | 49 | ||
50 | config = { | 50 | config = { |
51 | nixpkgs.config.packageOverrides = import ./default.nix; | 51 | nixpkgs.config.overlays = [ (import ./default.nix) ]; |
52 | 52 | ||
53 | systemd.services = listToAttrs (map dirService config.services.rollingDirectories); | 53 | systemd.services = listToAttrs (map dirService config.services.rollingDirectories); |
54 | }; | 54 | }; |