2 files changed, 7 insertions, 17 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index affb535ef..3590ad572 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
-
+{ config, pkgs, ... }:
+with config.krebs.lib;
 {
-  nixpkgs.config.packageOverrides = {
+  nixpkgs.config.packageOverrides = super: {
     # TODO use XDG_RUNTIME_DIR?
     cr = pkgs.writeDashBin "cr" ''
       set -efu
@@ -10,12 +10,14 @@
           --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 {};
+    ff = pkgs.writeDashBin "ff" ''
+      exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
+    '';
     gnupg =
       if elem config.krebs.build.host.name ["xu" "wu"]
         then super.gnupg21
diff --git a/tv/5pkgs/ff/default.nix b/tv/5pkgs/ff/default.nix
deleted file mode 100644
index b1d2c579a..000000000
--- a/tv/5pkgs/ff/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-# TODO use krebs.setuid
-# This requires that we can create setuid executables that can only be accessed
-# by a single user. [per-user-setuid]
-
-# using bash for %q
-pkgs.writeBashBin "ff" ''
- exec /var/setuid-wrappers/sudo -u ff -i <<EOF
- exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
- EOF
-''