push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,42 @@
{
lib,
mkKdeDerivation,
replaceVars,
sshfs,
qtconnectivity,
qtmultimedia,
qtwayland,
pkg-config,
wayland,
wayland-protocols,
libfakekey,
}:
mkKdeDerivation {
pname = "kdeconnect-kde";
patches = [
(replaceVars ./hardcode-sshfs-path.patch {
sshfs = lib.getExe sshfs;
})
];
# Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
postFixup = ''
mkdir -p $out/nix-support
echo "${sshfs}" > $out/nix-support/depends
'';
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtconnectivity
qtmultimedia
qtwayland
wayland
wayland-protocols
libfakekey
];
extraCmakeFlags = [
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
];
}

View File

@@ -0,0 +1,13 @@
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 29e94f3b..c71e552f 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -94,7 +94,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np)
QDir().mkpath(m_mountPoint);
- const QString program = QStringLiteral("sshfs");
+ const QString program = QStringLiteral("@sshfs@");
QString path;
if (np.has(QStringLiteral("multiPaths")))