pyrox.dev
Merge staging-next into staging
authored by
github-actions[bot]
and committed by
GitHub
8bf6698a
7d9f06ed
+1
-10
pkgs/applications/kde/marble.nix
+1
-10
pkgs/applications/kde/marble.nix
···
2
2
, extra-cmake-modules, kdoctools
3
3
, qtscript, qtsvg, qtquickcontrols, qtwebengine
4
4
, krunner, shared-mime-info, kparts, knewstuff
5
-
, gpsd, perl, fetchpatch
5
+
, gpsd, perl
6
6
}:
7
7
8
8
mkDerivation {
···
17
17
propagatedBuildInputs = [
18
18
qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
19
19
knewstuff gpsd
20
-
];
21
-
patches = [
22
-
(fetchpatch {
23
-
# Backport fix to allow compilation with gpsd 3.23.1
24
-
# Remove when marble compiles without the patch.
25
-
# See: https://invent.kde.org/education/marble/-/merge_requests/57
26
-
url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
27
-
sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
28
-
})
29
20
];
30
21
preConfigure = ''
31
22
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"