diff options
author | Andreas Baldeau <andreas@baldeau.net> | 2020-12-03 14:53:19 +0100 |
---|---|---|
committer | erictapen <justin.humm@posteo.de> | 2020-12-05 20:00:24 +0100 |
commit | 6dc4c0000fa1216caf1135ae67947576c176d11c (patch) | |
tree | b2ca6a90ad5ade8e26b43105d7d53ae87030f0cc | |
parent | 73935b18ddd58ad7895927b25dddf00af6151f1b (diff) |
mapmap: Fix startup issues and unbreak the derivation
* Apply patch from not yet merged upstream pull request to fix segfault
* Add wrapQtAppsHook to make it start again
* Mark as unbroken
-rw-r--r-- | pkgs/applications/video/mapmap/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 9d6ffbd439c4..7320deaf4ce4 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -1,11 +1,13 @@ -{ stdenv +{ stdenv , fetchFromGitHub +, fetchpatch , qttools , qtmultimedia , liblo , gst_all_1 , qmake , pkgconfig +, wrapQtAppsHook }: with stdenv; @@ -25,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig + wrapQtAppsHook ]; buildInputs = [ @@ -37,6 +40,14 @@ mkDerivation rec { gst_all_1.gst-vaapi ]; + patches = [ + (fetchpatch { + name = "message-handler-segfault.patch"; + url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch"; + sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp mapmap $out/bin/mapmap @@ -57,8 +68,6 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; - # binary segfaults at the moment - broken = true; }; } |