mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
marble: fix build with gpsd 3.23.1
This commit is contained in:
parent
0699530f08
commit
e08f549599
@ -2,7 +2,7 @@
|
||||
, extra-cmake-modules, kdoctools
|
||||
, qtscript, qtsvg, qtquickcontrols, qtwebengine
|
||||
, krunner, shared-mime-info, kparts, knewstuff
|
||||
, gpsd, perl
|
||||
, gpsd, perl, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -18,6 +18,15 @@ mkDerivation {
|
||||
qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
|
||||
knewstuff gpsd
|
||||
];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Backport fix to allow compilation with gpsd 3.23.1
|
||||
# Remove when marble compiles without the patch.
|
||||
# See: https://invent.kde.org/education/marble/-/merge_requests/57
|
||||
url = "https://invent.kde.org/education/marble/-/commit/8aadc3eb8f9484a65d497d442cd8c61fe1462bef.diff";
|
||||
sha256 = "sha256-ZkPXyunVItSRctv6SLGIonvyZwLDhCz+wfJrIXeHcDo=";
|
||||
})
|
||||
];
|
||||
preConfigure = ''
|
||||
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user