From d354f7cbe638715fd3258934ba611b6fa236f2ba Mon Sep 17 00:00:00 2001 From: Brenton Horne Date: Thu, 6 Dec 2018 14:57:30 +1000 Subject: [PATCH] atom, atom-beta: Fixing Exec= line in app launcher Prior to this commit the application launchers of Atom and Atom Beta executed `/usr/bin/${pname}` instead of what it is meant to `$out/bin/${pname}`. This is because upstream changed the `Exec=` line from `Exec=/usr/share/${pname}/${pname}` to `Exec=/usr/bin/${pname}` and the `substituteInPlace` line that was in the default.nix file was not appropriately adjusted. --- pkgs/applications/editors/atom/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 834c6bedf3c0..73a9f26a1221 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -44,8 +44,7 @@ let buildCommand = '' mkdir -p $out/usr/ ar p $src data.tar.xz | tar -C $out -xJ ./usr - substituteInPlace $out/usr/share/applications/${pname}.desktop \ - --replace /usr/share/${pname} $out/bin + sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/