From 2650803ff620e35de22ad91226f30d2b4ab9404f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 20 Nov 2015 16:59:15 +0100
Subject: mv pkgs ff: don't sudo

---
 mv/5pkgs/default.nix    | 6 +++++-
 mv/5pkgs/ff/default.nix | 8 --------
 2 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 mv/5pkgs/ff/default.nix

(limited to 'mv/5pkgs')

diff --git a/mv/5pkgs/default.nix b/mv/5pkgs/default.nix
index a852c2424..0c72c450e 100644
--- a/mv/5pkgs/default.nix
+++ b/mv/5pkgs/default.nix
@@ -12,7 +12,11 @@
         --disk-cache-size=50000000 \
         "%@"
   '';
-  ff = pkgs.callPackage ./ff {};
+  ff = pkgs.writeScriptBin "ff" ''
+    #! /bin/sh
+    set -efu
+    exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
+  '';
   xmonad-tv =
     let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
     pkgs.haskellPackages.callPackage src {};
diff --git a/mv/5pkgs/ff/default.nix b/mv/5pkgs/ff/default.nix
deleted file mode 100644
index 2db404030..000000000
--- a/mv/5pkgs/ff/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeScriptBin "ff" ''
- #! ${pkgs.bash}/bin/bash
- exec sudo -u ff -i <<EOF
- exec ${pkgs.firefoxWrapper}/bin/firefox $(printf " %q" "$@")
- EOF
-''
-- 
cgit v1.2.3