public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sublime-merge: askpass bug fix

Browse Source 
Replace ssh-askpass-sublime executable from sublime-merge that is incompatable with the nix package wrapper. Fixes NixOS/nixpkgs#88600
This commit is contained in:
Tim Zook 2020-05-27 13:48:05 -05:00
parent 84b7946079
commit f09718c84a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/sublime-merge/common.nix
View File

@ -67,6 +67,16 @@ in let
--set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \
--set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
# We need to replace the ssh-askpass-sublime executable because the default one
# will not function properly, in order to work it needs to pass an argv[0] to
# the sublime_merge binary, and the built-in version will will try to call the
# sublime_merge wrapper script which cannot pass through the original argv[0] to
# the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is
# very simple and can be replaced with a simple wrapper script.
rm $out/ssh-askpass-sublime
makeWrapper $out/.${primaryBinary}-wrapped $out/ssh-askpass-sublime \
--argv0 "/ssh-askpass-sublime"
''; '';
}; };
in stdenv.mkDerivation (rec { in stdenv.mkDerivation (rec {