Merging against master - updating smokingpig, rebase was going to be messy

2017-01-26 02:00:04 -08:00
parent ad8fde5e5d 142696de88
commit a26a796d5c
956 changed files with 25853 additions and 24254 deletions
@@ -275,7 +275,14 @@ in
    ];
    security.permissionsWrappers.setuid = [
      { program = "fping";
-        source  = "${e.enlightenment.out}/bin/fping";
+        source  = "${pkgs.fping}/bin/fping";
+        owner   = "root";
+        group   = "root";
+        setuid  = true;
+      }
+
+      { program = "fping";
+        source  = "${pkgs.fping}/bin/fping6";
        owner   = "root";
        group   = "root";
        setuid  = true;