diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-10-19 08:33:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-10-19 08:33:13 +0200 |
| commit | 3bd85fa720ceb2f1f0204e5b0410831f4b9f9254 (patch) | |
| tree | 8d3e45cd4d71dfd95c4a68c13cad9f18346ab6e5 /pkgs/applications/kde | |
| parent | b0a41194a138dd25b2f0178befe0dd1fbd4d51c6 (diff) | |
| download | nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar.gz nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar.bz2 nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar.lz nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar.xz nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.tar.zst nixpkgs-3bd85fa720ceb2f1f0204e5b0410831f4b9f9254.zip | |
Revert "marble: fix build with gpsd 3.23.1"
The patch is already included in the current source. It's PR #140523 adding the patch and PR #141127 updating KDE apps; they missed each other (different target branches, different files). This reverts commit e08f54959964c966b027dbec84dd6e37070988b0.
Diffstat (limited to 'pkgs/applications/kde')
| -rw-r--r-- | pkgs/applications/kde/marble.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 637ae3bc977..7fe3aa529fa 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff -, gpsd, perl, fetchpatch +, gpsd, perl }: mkDerivation { @@ -18,15 +18,6 @@ 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" ''; |