Merge remote-tracking branch 'cd/master'

1 files changed, 20 insertions, 17 deletions

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index be10e91eb..b520e1a32 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,22 +1,25 @@
 { pkgs, ... }:
 
 {
-  cr = pkgs.writeScriptBin "cr" ''
-    #! /bin/sh
-    set -efu
-    export LC_TIME=de_DE.utf8
-    exec ${pkgs.chromium}/bin/chromium \
-        --ssl-version-min=tls1 \
-        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
-        --disk-cache-size=50000000 \
-        "%@"
-  '';
-  ejabberd = pkgs.callPackage ./ejabberd {
-    erlang = pkgs.erlangR16;
+  nixpkgs.config.packageOverrides = {
+    # TODO use XDG_RUNTIME_DIR?
+    cr = pkgs.writeScriptBin "cr" ''
+      #! /bin/sh
+      set -efu
+      export LC_TIME=de_DE.utf8
+      exec ${pkgs.chromium}/bin/chromium \
+          --ssl-version-min=tls1 \
+          --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+          --disk-cache-size=50000000 \
+          "%@"
+    '';
+    ejabberd = pkgs.callPackage ./ejabberd {
+      erlang = pkgs.erlangR16;
+    };
+    ff = pkgs.callPackage ./ff {};
+    viljetic-pages = pkgs.callPackage ./viljetic-pages {};
+    xmonad-tv =
+      let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
+      pkgs.haskellPackages.callPackage src {};
   };
-  ff = pkgs.callPackage ./ff {};
-  viljetic-pages = pkgs.callPackage ./viljetic-pages {};
-  xmonad-tv =
-    let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
-    pkgs.haskellPackages.callPackage src {};
 }