From ad816aaa281094fc4fde1755de618440a5a1df28 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 23 Jul 2016 11:47:46 +0200
Subject: tv pkgs.ff: drop sudo

---
 tv/5pkgs/default.nix    |  4 +++-
 tv/5pkgs/ff/default.nix | 12 ------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 tv/5pkgs/ff/default.nix

(limited to 'tv')

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 040a6ff3d..0b28747d5 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -15,7 +15,9 @@
     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
-''
-- 
cgit v1.2.3