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,43 @@
{
mkKdeDerivation,
pkg-config,
systemd,
elfutils,
gdb,
python3,
replaceVars,
}:
let
gdb' = gdb.override {
hostCpuOnly = true;
python3 = python3.withPackages (ps: [
ps.psutil
ps.pygdbmi
ps.sentry-sdk
]);
};
in
mkKdeDerivation {
pname = "drkonqi";
patches = [
(replaceVars ./hardcode-paths.patch {
gdb = "${gdb'}/bin/gdb";
eu-unstrip = "${elfutils}/bin/eu-unstrip";
})
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ systemd ];
extraCmakeFlags = [
"-DWITH_GDB12=1"
"-DWITH_PYTHON_VENDORING=0"
];
# Hardcoded as QString, which is UTF-16 so Nix can't pick it up automatically
postFixup = ''
mkdir -p $out/nix-support
echo "${gdb'}" > $out/nix-support/depends
'';
}

View File

@@ -0,0 +1,49 @@
diff --git a/src/data/gdb_preamble/preamble.py b/src/data/gdb_preamble/preamble.py
index 4855231b5..a488025c1 100644
--- a/src/data/gdb_preamble/preamble.py
+++ b/src/data/gdb_preamble/preamble.py
@@ -773,7 +773,7 @@ def resolve_modules():
# core doesn't contain one. That makes the ids a bit unreliable but still better than nothing I suppose.
# Ultimately we'll want to use gdb here.
# https://sourceware.org/bugzilla/show_bug.cgi?id=32844
- output = get_stdout(['eu-unstrip', "--list-only", f"--core={corefile}"], env=env)
+ output = get_stdout(['@eu-unstrip@', "--list-only", f"--core={corefile}"], env=env)
for line in output.splitlines():
image = CoreImage(line)
if image.valid:
diff --git a/src/debugger.cpp b/src/debugger.cpp
index 946bdd12e..5c24b3713 100644
--- a/src/debugger.cpp
+++ b/src/debugger.cpp
@@ -36,12 +36,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
result.push_back(std::make_shared<Data>(
Data{.displayName = i18nc("@label the debugger called GDB", "GDB"),
.codeName = u"gdb"_s,
- .tryExec = u"gdb"_s,
+ .tryExec = u"@gdb@"_s,
.backendData =
- BackendData{.command = u"gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
+ BackendData{.command = u"@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath"_s,
.supportsCommandWithSymbolResolution = true,
.commandWithSymbolResolution =
- u"gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
+ u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
.preambleCommands = expandCommand(
u"gdb"_s,
@@ -63,12 +63,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
Data{
.displayName = i18nc("@label the debugger called GDB", "GDB"),
.codeName = u"gdb"_s,
- .tryExec = u"gdb"_s,
+ .tryExec = u"@gdb@"_s,
.backendData = BackendData{
- .command = u"gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
+ .command = u"@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
.supportsCommandWithSymbolResolution = true,
.commandWithSymbolResolution =
- u"gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
+ u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
.preambleCommands = expandCommand(
u"gdb"_s,