Skip to content

Commit 2c0ac00

Browse files
committed
fix sshfs openssh-gssapi override
fixed to match the new format in NixOS/nixpkgs#526462
1 parent 0310e0c commit 2c0ac00

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

profiles/base.nix

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,9 @@ in
237237
emacs
238238

239239
# Default openssh doesn't include GSSAPI support, so we need to override sshfs
240-
# to use the openssh_gssapi package instead. This is annoying because the
241-
# sshfs package's openssh argument is nested in another layer of callPackage,
242-
# so we override callPackage instead to override openssh.
240+
# to use the openssh_gssapi package instead.
243241
(sshfs.override {
244-
callPackage =
245-
fn: args:
246-
(pkgs.callPackage fn args).override {
247-
openssh = pkgs.openssh_gssapi;
248-
};
242+
openssh = pkgs.openssh_gssapi;
249243
})
250244

251245
comma-with-db

0 commit comments

Comments
 (0)