Merge pull request #117045 from dotlambda/pure-maps-fix

pure-maps: fix

authored by

Robert Schütz and committed by
GitHub
08d3f9aa e1bb0858

+11 -8
+11 -8
pkgs/applications/misc/pure-maps/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook 2 , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors 3 , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry 4 - , python3, pyotherside, python3Packages 5 }: 6 7 mkDerivation rec { ··· 16 fetchSubmodules = true; 17 }; 18 19 - nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; 20 buildInputs = [ 21 kirigami2 qtquickcontrols2 qtlocation qtsensors 22 nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry 23 ]; 24 - propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ]; 25 26 postPatch = '' 27 substituteInPlace pure-maps.pro \ ··· 30 31 qmakeFlags = [ "FLAVOR=kirigami" ]; 32 33 - dontWrapQtApps = true; 34 - postInstall = '' 35 - wrapQtApp $out/bin/pure-maps \ 36 - --prefix PYTHONPATH : "$out/share" 37 ''; 38 39 meta = with lib; {
··· 1 + { lib, mkDerivation, fetchFromGitHub 2 , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors 3 , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry 4 + , python3, pyotherside 5 }: 6 7 mkDerivation rec { ··· 16 fetchSubmodules = true; 17 }; 18 19 + nativeBuildInputs = [ 20 + qmake python3 qttools python3.pkgs.wrapPython 21 + ]; 22 + 23 buildInputs = [ 24 kirigami2 qtquickcontrols2 qtlocation qtsensors 25 nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry 26 ]; 27 28 postPatch = '' 29 substituteInPlace pure-maps.pro \ ··· 32 33 qmakeFlags = [ "FLAVOR=kirigami" ]; 34 35 + pythonPath = with python3.pkgs; [ gpxpy ]; 36 + 37 + preInstall = '' 38 + buildPythonPath "$pythonPath" 39 + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") 40 ''; 41 42 meta = with lib; {