diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-03-25 12:04:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 12:04:17 +0100 |
| commit | 08d3f9aa07ab33efb459fb36f4e3f28f16e603bb (patch) | |
| tree | f517b157e929c099746d0a253eae45fd24fc4e61 /pkgs/applications | |
| parent | e1bb08589ffb95eaf5b00eb51ea744d28c98726e (diff) | |
| parent | e4afb2ce909d3b2ae9cb24becaeb757194f6259c (diff) | |
Merge pull request #117045 from dotlambda/pure-maps-fix
pure-maps: fix
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/pure-maps/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 3ee87d58c083..14141ca1ea37 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry -, python3, pyotherside, python3Packages +, python3, pyotherside }: mkDerivation rec { @@ -16,12 +16,14 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake python3 qttools python3.pkgs.wrapPython + ]; + buildInputs = [ kirigami2 qtquickcontrols2 qtlocation qtsensors nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry ]; - propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ]; postPatch = '' substituteInPlace pure-maps.pro \ @@ -30,10 +32,11 @@ mkDerivation rec { qmakeFlags = [ "FLAVOR=kirigami" ]; - dontWrapQtApps = true; - postInstall = '' - wrapQtApp $out/bin/pure-maps \ - --prefix PYTHONPATH : "$out/share" + pythonPath = with python3.pkgs; [ gpxpy ]; + + preInstall = '' + buildPythonPath "$pythonPath" + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; meta = with lib; { |