From ba785adb282aa8fc27d94a72c465b1038ee738f0 Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Fri, 28 Jan 2022 16:45:08 -0500 Subject: [PATCH 1/2] fahcontrol: fix variable substitution for shortcut Because single quotes are used in the sed command, the application shortcut had the literal $out instead of the package path. --- pkgs/applications/science/misc/foldingathome/control.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 1430881a3f08..e5cc02edcfbe 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { installPhase = "cp -ar usr $out"; postFixup = '' - sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop + 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" From 3c0680b7834c10ccfe91397794e400ae40fde368 Mon Sep 17 00:00:00 2001 From: Andrew Fontaine Date: Fri, 28 Jan 2022 16:46:23 -0500 Subject: [PATCH 2/2] fahviewer: fix variable substitution for shortcut Because single quotes are used in the sed command, the application shortcut had the literal $out instead of the package path. --- pkgs/applications/science/misc/foldingathome/viewer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 52ca9c9e623f..75e900a0a72c 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { unpackPhase = '' dpkg-deb -x ${src} ./ - sed -e 's|/usr/bin|$out/bin|g' -i usr/share/applications/FAHViewer.desktop + sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop ''; installPhase = ''