diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 15:12:10 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 15:12:10 +0200 |
commit | 438224380999b142ad67bca6fe858fae7a5be11b (patch) | |
tree | 598028ce7275f9149dcfb79f039767f4a2933b44 /custom | |
parent | c3f3e1a0c0e75f6befa10f58f32949e91c6b3b5f (diff) | |
download | nixos-438224380999b142ad67bca6fe858fae7a5be11b.tar nixos-438224380999b142ad67bca6fe858fae7a5be11b.tar.gz nixos-438224380999b142ad67bca6fe858fae7a5be11b.tar.bz2 nixos-438224380999b142ad67bca6fe858fae7a5be11b.tar.xz nixos-438224380999b142ad67bca6fe858fae7a5be11b.zip |
...
Diffstat (limited to 'custom')
-rw-r--r-- | custom/bar-service.nix | 4 | ||||
-rw-r--r-- | custom/thermoprint-service.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/custom/bar-service.nix b/custom/bar-service.nix index d11840c1..97e6f592 100644 --- a/custom/bar-service.nix +++ b/custom/bar-service.nix | |||
@@ -82,7 +82,7 @@ in { | |||
82 | users.groups."${cfg.group}" = {}; | 82 | users.groups."${cfg.group}" = {}; |
83 | 83 | ||
84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
85 | haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { | 85 | haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { |
86 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; | 86 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; |
87 | }); | 87 | }); |
88 | 88 | ||
@@ -108,7 +108,7 @@ in { | |||
108 | Group = cfg.group; | 108 | Group = cfg.group; |
109 | WorkingDirectory = cfg.stateDir; | 109 | WorkingDirectory = cfg.stateDir; |
110 | 110 | ||
111 | ExecStart = with pkgs; "${bar}/bin/bar"; | 111 | ExecStart = "${pkgs.bar}/bin/bar"; |
112 | }; | 112 | }; |
113 | }; | 113 | }; |
114 | }; | 114 | }; |
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix index d9131f6f..a7291b8c 100644 --- a/custom/thermoprint-service.nix +++ b/custom/thermoprint-service.nix | |||
@@ -18,7 +18,7 @@ in { | |||
18 | 18 | ||
19 | config = mkIf pCfg.enable { | 19 | config = mkIf pCfg.enable { |
20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
21 | haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: | 21 | haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: |
22 | import ./thermoprint { | 22 | import ./thermoprint { |
23 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); | 23 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); |
24 | extraPackages = pCfg.extraServerPackages; | 24 | extraPackages = pCfg.extraServerPackages; |