mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-17 12:50:04 +00:00
lomiri.libusermetrics: Link against our qdjango build again (#559529)
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
testers,
|
||||
cmake,
|
||||
@@ -42,6 +43,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"doc"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Upstream switched to building qdjango statically so users don't have to build & install a dead project.
|
||||
# Maybe https://gitlab.com/ubports/development/core/libusermetrics/-/merge_requests/24 will get rid of it for good.
|
||||
# Until then, undo & link against our system-installed build.
|
||||
(fetchpatch {
|
||||
name = "0001-libusermetrics-revert-qdjango-vendoring.patch";
|
||||
url = "https://gitlab.com/ubports/development/core/libusermetrics/-/commit/87f83dd4711bfb4e94fd87bc68403a9bd5cfef2a.patch";
|
||||
revert = true;
|
||||
includes = [
|
||||
"CMakeLists.txt"
|
||||
"src/usermetricsservice/CMakeLists.txt"
|
||||
];
|
||||
hash = "sha256-OPTQPRr10I7bk7dQ/9x17mv42pKc8yIQUGEGak01Hic=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Tries to query QMake for QT_INSTALL_QML variable, would return broken paths into /build/qtbase-<commit> even if qmake was available
|
||||
substituteInPlace src/modules/UserMetrics/CMakeLists.txt \
|
||||
|
||||
Reference in New Issue
Block a user