summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorJustin Humm <justin.humm@posteo.de>2020-12-12 18:53:54 +0100
committerJustin Humm <justin.humm@posteo.de>2020-12-12 18:53:54 +0100
commite7525e2c7ab61770893c76a21511a70a008b6fe5 (patch)
tree03b50a28b3b9185f43789b3203cd1de499656824 /pkgs
parent95042a58fba9a1471da344bdbb7ce377d2b4205a (diff)
mapmap: build with libsForQt5
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/video/mapmap/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 7320deaf4ce4..003da6e6a941 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -46,6 +46,11 @@ mkDerivation rec {
url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
})
+ # fix build with libsForQt515
+ (fetchpatch {
+ url = "https://github.com/mapmapteam/mapmap/pull/518/commits/ac49acc1e2ec839832b86838e93a8c13030affeb.patch";
+ sha256 = "sha256-tSLbyIDv5mSejnw9oru5KLAyQqjgJLLREKQomEUcGt8=";
+ })
];
installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e9cfe3dfaa4..dcabc90d7d40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22589,7 +22589,7 @@ in
mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
- mapmap = libsForQt514.callPackage ../applications/video/mapmap { };
+ mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
marathonctl = callPackage ../tools/virtualization/marathonctl { } ;