summaryrefslogtreecommitdiffstats
path: root/tv/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
committerlassulus <lass@aidsballs.de>2016-02-01 15:17:16 +0100
commitc5441d30682e0dbe31ebc09bfff6fc0bd0056677 (patch)
tree9201c304bbe936b0e40b8526959ba519db52e154 /tv/5pkgs/default.nix
parent7675c4ca52b4e34b9e411b6aee3b31fc129e7b50 (diff)
parenta2f2f15c5ac0e4d37f8c8e3dcbacab696c832404 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/5pkgs/default.nix')
-rw-r--r--tv/5pkgs/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 2108d97..be10e91 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -11,6 +11,9 @@
--disk-cache-size=50000000 \
"%@"
'';
+ ejabberd = pkgs.callPackage ./ejabberd {
+ erlang = pkgs.erlangR16;
+ };
ff = pkgs.callPackage ./ff {};
viljetic-pages = pkgs.callPackage ./viljetic-pages {};
xmonad-tv =