diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f20ebbeae3f..ad540c46411 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -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 { diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index a8fb944319c..7a0c0d1f1ed 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2011"; - sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; + buildVersion = "2022"; + sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61"; dev = true; } {}; }