tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
marble: fix build with gpsd 3.23.1
Hunter Jones
4 years ago
e08f5495
0699530f
+10
-1
1 changed file
expand all
collapse all
unified
split
pkgs
applications
kde
marble.nix
+10
-1
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
5
-
, gpsd, perl
5
5
+
, gpsd, perl, fetchpatch
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
20
+
];
21
21
+
patches = [
22
22
+
(fetchpatch {
23
23
+
# Backport fix to allow compilation with gpsd 3.23.1
24
24
+
# Remove when marble compiles without the patch.
25
25
+
# See: https://invent.kde.org/education/marble/-/merge_requests/57
26
26
+
url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
27
27
+
sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
28
28
+
})
20
29
];
21
30
preConfigure = ''
22
31
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"