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" ]) diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 8f89770ffc85..0a72e6bb91eb 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb -, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp +, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium }: let @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper fakeroot file getopt ]; - outputs = [ "out" "monodevelop" "sandbox" ]; + outputs = [ "out" "monodevelop" ]; unpackPhase = '' echo -e 'q\ny' | fakeroot sh $src @@ -91,12 +91,10 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - install -Dm755 Editor/chrome-sandbox $sandbox/bin/unity-chrome-sandbox - unitydir="$out/opt/Unity/Editor" mkdir -p $unitydir mv Editor/* $unitydir - ln -sf /var/setuid-wrappers/unity-chrome-sandbox $unitydir/chrome-sandbox + ln -sf /var/setuid-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox mkdir -p $out/share/applications sed "/^Exec=/c\Exec=$out/bin/unity-editor" \