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

Merge pull request #90685 from zookatron/sublime-merge

Browse Source 
sublime-merge: askpass bug fix
This commit is contained in:
Daniël de Kok 2020-06-25 19:54:14 +02:00 committed by GitHub
commit 6b096983f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 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 LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \
"''${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 {

4
pkgs/applications/version-management/sublime-merge/default.nix
View File

@ -9,8 +9,8 @@ in {
} {};
sublime-merge-dev = common {
buildVersion = "2011";
sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp";
buildVersion = "2022";
sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61";
dev = true;
} {};
}