From 39767f8ae50a8ed1878c550c9fb45f3253d7cbed Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 19 Mar 2020 14:05:54 +0100 Subject: [PATCH] foldingathome: Make FAHControl be able to start the FAHViewer (#82925) The command to run when clicking the button is configurable, but by default it tries to run `FAHViewer`. --- pkgs/applications/science/misc/foldingathome/control.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index be400ffe5f9..e8eba4c2ab2 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,6 +1,7 @@ { stdenv , autoPatchelfHook , dpkg +, fahviewer , fetchurl , makeWrapper , python2 @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ python ]; + buildInputs = [ fahviewer python ]; doBuild = false; @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { postFixup = '' sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop wrapProgram "$out/bin/FAHControl" \ + --suffix PATH : "${fahviewer.outPath}/bin" \ --set PYTHONPATH "$out/lib/python2.7/dist-packages" '';