public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mapmap: Fix startup issues and unbreak the derivation

Browse Source 
* Apply patch from not yet merged upstream pull request to fix segfault
* Add wrapQtAppsHook to make it start again
* Mark as unbroken
This commit is contained in:
Andreas Baldeau 2020-12-03 14:53:19 +01:00 committed by erictapen
parent 73935b18dd
commit 6dc4c0000f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/mapmap/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, qttools , qttools
, qtmultimedia , qtmultimedia
, liblo , liblo
, gst_all_1 , gst_all_1
, qmake , qmake
, pkgconfig , pkgconfig
, wrapQtAppsHook
}: }:
with stdenv; with stdenv;
@ -25,6 +27,7 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
qmake qmake
pkgconfig pkgconfig
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
@ -37,6 +40,14 @@ mkDerivation rec {
gst_all_1.gst-vaapi 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 = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp mapmap $out/bin/mapmap cp mapmap $out/bin/mapmap
@ -57,8 +68,6 @@ mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.erictapen ]; maintainers = [ maintainers.erictapen ];
platforms = platforms.linux; platforms = platforms.linux;
# binary segfaults at the moment
broken = true;
}; };
} }