summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-08-08 01:56:47 +0300
committerNikolay Amiantov <ab@fmap.me>2016-08-08 10:49:00 +0300
commit1e8894f085f0fb9f323058bc7168a9073ef9f6bb (patch)
tree298568057bf5e39ff1d62c4d20c1720a39ac2c8d /nixos
parentb2413e48aea29b24ae9994c2c8bddf7e96245cc2 (diff)
downloadnixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar.gz
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar.bz2
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar.lz
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar.xz
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.tar.zst
nixlib-1e8894f085f0fb9f323058bc7168a9073ef9f6bb.zip
unity3d: use chromium-suid-sandbox
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/programs/unity3d.nix25
-rw-r--r--nixos/modules/rename.nix3
3 files changed, 3 insertions, 26 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 98af71e014dd..35a48ca601be 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -80,7 +80,6 @@
   ./programs/ssh.nix
   ./programs/ssmtp.nix
   ./programs/tmux.nix
-  ./programs/unity3d.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
   ./programs/xfs_quota.nix
diff --git a/nixos/modules/programs/unity3d.nix b/nixos/modules/programs/unity3d.nix
deleted file mode 100644
index 3c0ea26d9d56..000000000000
--- a/nixos/modules/programs/unity3d.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.programs.unity3d;
-in {
-
-  options = {
-    programs.unity3d.enable = mkEnableOption "Unity3D, a game development tool";
-  };
-
-  config = mkIf cfg.enable {
-    security.setuidOwners = [{
-      program = "unity-chrome-sandbox";
-      source = "${pkgs.unity3d.sandbox}/bin/unity-chrome-sandbox";
-      owner = "root";
-      #group = "root";
-      setuid = true;
-      #setgid = true;
-    }];
-
-    environment.systemPackages = [ pkgs.unity3d ];
-  };
-
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 634f91a275d3..3f8a770cbce7 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -134,6 +134,9 @@ with lib;
     (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ])
     (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ])
 
+    # Unity3D
+    (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])
     (mkRemovedOptionModule [ "programs" "bash" "enable" ])