summaryrefslogtreecommitdiffstats
path: root/mv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-11-20 16:59:15 +0100
committertv <tv@krebsco.de>2015-11-20 16:59:15 +0100
commit2650803ff620e35de22ad91226f30d2b4ab9404f (patch)
treea76771e8df1eb1ce5056ed0f930c51db06998350 /mv
parent817a78c711b8448f1020b010aef8d9fcf6c9c77a (diff)
mv pkgs ff: don't sudo
Diffstat (limited to 'mv')
-rw-r--r--mv/5pkgs/default.nix6
-rw-r--r--mv/5pkgs/ff/default.nix8
2 files changed, 5 insertions, 9 deletions
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
-''