From 6ead149ff91220706c0a347468925a2a288ca829 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Wed, 19 Jul 2017 17:40:52 -0500 Subject: prl-tools: remove user services using .desktop files --- pkgs/os-specific/linux/prl-tools/default.nix | 30 ---------------------------- 1 file changed, 30 deletions(-) (limited to 'pkgs/os-specific/linux/prl-tools') diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 548725ae4e3..9fe331e6cb1 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -11,26 +11,6 @@ let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version; x64 = if stdenv.system == "x86_64-linux" then true else if stdenv.system == "i686-linux" then false else abort "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; - # We autostart user services by ourselves, because prlcc uses hardcoded paths. - autostart = [ { exec = "prlcc"; - description = "Parallels Control Center"; - } - { exec = "prldhd"; - description = "Parallels Control Center"; # not a mistake - } - { exec = "prl_wmouse_d"; - description = "Parallels Walking Mouse Daemon"; - } - { exec = "prlcp"; - description = "Parallels CopyPaste Tool"; - } - { exec = "prlsga"; - description = "Parallels Shared Guest Applications Tool"; - } - { exec = "prlshprof"; - description = "Parallels Shared Profile Tool"; - } - ]; in stdenv.mkDerivation rec { version = "${prl_major}.2.1-41615"; @@ -87,11 +67,6 @@ stdenv.mkDerivation rec { stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); - desktops = map (x: substituteAll ({ - src = ./autostart.desktop; - name = x.exec + ".desktop"; - version = version; - } // x)) autostart; installPhase = '' if test -z "$libsOnly"; then @@ -144,11 +119,6 @@ stdenv.mkDerivation rec { sed 's,/bin/bash,${stdenv.shell},g' $i > $out/lib/udev/rules.d/$i done - mkdir -p $out/share/autostart - for i in $desktops; do - cat $i | sed "s,^Exec=,Exec=$out/bin/," > $out/share/autostart/$(basename $i) - done - ( cd xorg.${xorgVer} # Install the X modules. -- cgit 1.4.1