Loading pkgs/applications/gis/qgis/ltr.nix +9 −3 Original line number Diff line number Diff line { lib, makeWrapper, symlinkJoin { lib , makeWrapper , symlinkJoin , extraPythonPackages ? (ps: [ ]) , libsForQt5 }: with lib; let qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; in symlinkJoin rec { Loading @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-ltr-unwrapped ]; nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); Loading pkgs/applications/gis/qgis/unwrapped-ltr.nix +49 −39 Original line number Diff line number Diff line { lib , mkDerivation , fetchFromGitHub , makeWrapper , mkDerivation , substituteAll , wrapGAppsHook , withGrass ? true , withWebKit ? false , bison , cmake , ninja , exiv2 , fcgi , flex , bison , proj , geos , sqlite , grass , gsl , qwt , fcgi , python3 , hdf5 , libspatialindex , libspatialite , postgresql , txt2tags , openssl , libzip , hdf5 , netcdf , exiv2 , ninja , openssl , pdal , postgresql , proj , protobuf , qtbase , qtsensors , python3 , qca-qt5 , qtkeychain , qt3d , qscintilla , qt3d , qtbase , qtkeychain , qtlocation , qtsensors , qtserialport , qtxmlpatterns , withGrass ? true , grass , withWebKit ? false , qtwebkit , pdal , qtxmlpatterns , qwt , sqlite , txt2tags , zstd , makeWrapper , wrapGAppsHook , substituteAll }: let Loading @@ -53,24 +55,24 @@ let }; pythonBuildInputs = with py.pkgs; [ qscintilla-qt5 chardet gdal jinja2 numpy owslib psycopg2 chardet pygments pyqt-builder pyqt5 python-dateutil pyyaml pytz pyyaml qscintilla-qt5 requests urllib3 pygments pyqt5 pyqt-builder sip setuptools owslib sip six urllib3 ]; in mkDerivation rec { version = "3.28.10"; Loading @@ -88,6 +90,16 @@ in mkDerivation rec { inherit py; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook bison cmake flex ninja ]; buildInputs = [ openssl proj Loading Loading @@ -120,8 +132,6 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; patches = [ (substituteAll { src = ./set-pyqt-package-dirs-ltr.patch; Loading @@ -143,10 +153,10 @@ in mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. # using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} Loading Loading
pkgs/applications/gis/qgis/ltr.nix +9 −3 Original line number Diff line number Diff line { lib, makeWrapper, symlinkJoin { lib , makeWrapper , symlinkJoin , extraPythonPackages ? (ps: [ ]) , libsForQt5 }: with lib; let qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; in symlinkJoin rec { Loading @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-ltr-unwrapped ]; nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); Loading
pkgs/applications/gis/qgis/unwrapped-ltr.nix +49 −39 Original line number Diff line number Diff line { lib , mkDerivation , fetchFromGitHub , makeWrapper , mkDerivation , substituteAll , wrapGAppsHook , withGrass ? true , withWebKit ? false , bison , cmake , ninja , exiv2 , fcgi , flex , bison , proj , geos , sqlite , grass , gsl , qwt , fcgi , python3 , hdf5 , libspatialindex , libspatialite , postgresql , txt2tags , openssl , libzip , hdf5 , netcdf , exiv2 , ninja , openssl , pdal , postgresql , proj , protobuf , qtbase , qtsensors , python3 , qca-qt5 , qtkeychain , qt3d , qscintilla , qt3d , qtbase , qtkeychain , qtlocation , qtsensors , qtserialport , qtxmlpatterns , withGrass ? true , grass , withWebKit ? false , qtwebkit , pdal , qtxmlpatterns , qwt , sqlite , txt2tags , zstd , makeWrapper , wrapGAppsHook , substituteAll }: let Loading @@ -53,24 +55,24 @@ let }; pythonBuildInputs = with py.pkgs; [ qscintilla-qt5 chardet gdal jinja2 numpy owslib psycopg2 chardet pygments pyqt-builder pyqt5 python-dateutil pyyaml pytz pyyaml qscintilla-qt5 requests urllib3 pygments pyqt5 pyqt-builder sip setuptools owslib sip six urllib3 ]; in mkDerivation rec { version = "3.28.10"; Loading @@ -88,6 +90,16 @@ in mkDerivation rec { inherit py; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook bison cmake flex ninja ]; buildInputs = [ openssl proj Loading Loading @@ -120,8 +132,6 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; patches = [ (substituteAll { src = ./set-pyqt-package-dirs-ltr.patch; Loading @@ -143,10 +153,10 @@ in mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. # using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} Loading