rescuetime: use patchelf to avoid LD_PRELOAD hack

1 files changed, 5 insertions, 12 deletions

diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 7ad8a85a419..57cdfd08d5b 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -11,33 +11,26 @@ let
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
       sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab";
     };
-
-in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
   name = "rescuetime-2.10.0.1322";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
+  # avoid https://github.com/NixOS/patchelf/issues/99
+  dontStrip = true;
   unpackPhase = ''
     mkdir pkg
     dpkg-deb -x $src pkg
     sourceRoot=pkg
   '';
-  installPhase = let
-
-    lib = p: stdenv.lib.makeLibraryPath [ p ];
-
-  in ''
+  installPhase = ''
     mkdir -p $out/bin
     cp usr/bin/rescuetime $out/bin
 
     ${patchelf}/bin/patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \
       $out/bin/rescuetime
-
-    wrapProgram $out/bin/rescuetime \
-      --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1
   '';
   meta = with lib; {
     description = "Helps you understand your daily habits so you can focus and be more productive";