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

pure-maps: fix

Changed files
+11 -8
pkgs
applications
misc
pure-maps
+11 -8
pkgs/applications/misc/pure-maps/default.nix
···
-
{ 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 {
···
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 \
···
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; {