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

pure-maps: fix wrapper to include python dependencies

Browse Source 
Co-authored-by: Robert Schütz <dev@schuetz-co.de>
This commit is contained in:
Tom Hall 2021-03-13 15:03:37 +00:00 committed by Robert Schütz
parent f5e8bdd07d
commit e4afb2ce90
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/misc/pure-maps/default.nix
View File

@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchFromGitHub, wrapQtAppsHook { lib, mkDerivation, fetchFromGitHub
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry
, python3, pyotherside, python3Packages , python3, pyotherside
}: }:
mkDerivation rec { mkDerivation rec {
@ -16,12 +16,14 @@ mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ qmake python3 qttools wrapQtAppsHook ]; nativeBuildInputs = [
qmake python3 qttools python3.pkgs.wrapPython
];
buildInputs = [ buildInputs = [
kirigami2 qtquickcontrols2 qtlocation qtsensors kirigami2 qtquickcontrols2 qtlocation qtsensors
nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry
]; ];
propagatedBuildInputs = with python3Packages; [ gpxpy pyxdg ];
postPatch = '' postPatch = ''
substituteInPlace pure-maps.pro \ substituteInPlace pure-maps.pro \
@ -30,10 +32,11 @@ mkDerivation rec {
qmakeFlags = [ "FLAVOR=kirigami" ]; qmakeFlags = [ "FLAVOR=kirigami" ];
dontWrapQtApps = true; pythonPath = with python3.pkgs; [ gpxpy ];
postInstall = ''
wrapQtApp $out/bin/pure-maps \ preInstall = ''
--prefix PYTHONPATH : "$out/share" buildPythonPath "$pythonPath"
qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
''; '';
meta = with lib; { meta = with lib; {