Merge pull request #106770 from erictapen/mapmap-qt515

mapmap: build with libsForQt5
This commit is contained in:
Gabriel Ebner 2020-12-12 19:41:33 +01:00 committed by GitHub
commit 5a4107057a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View file

@ -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 = ''

View file

@ -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 { } ;