diff options
| author | Will Cohen <willcohen@users.noreply.github.com> | 2022-01-25 14:16:18 -0500 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-01-25 23:14:33 -0800 |
| commit | de256f2c029238e60a4be5bec42db6c7c86f3e0e (patch) | |
| tree | a5465a0d1294300884484ae8c82a448108ae4930 /pkgs/applications/gis | |
| parent | 85d0a94f900a281e1de3a9a7a6dd52bd09736692 (diff) | |
| download | nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar.gz nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar.bz2 nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar.lz nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar.xz nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.tar.zst nixpkgs-de256f2c029238e60a4be5bec42db6c7c86f3e0e.zip | |
qgis, qgis-ltr: only expose unwrapped via passthru
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/grass/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/ltr.nix | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 7ba2dc5c8ff..16e6a818e5a 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/grass78 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python3Packages.python}/bin/${python3Packages.python.executable} \ + --set GRASS_PYTHON ${python3Packages.python.interpreter} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass*/lib $out/lib ln -s $out/grass*/include $out/include diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 43598bc852f..b3220f8d708 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,8 +1,12 @@ { lib, makeWrapper, symlinkJoin -, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 }: with lib; -symlinkJoin rec { +let + qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; +in symlinkJoin rec { + inherit (qgis-unwrapped) version; name = "qgis-${version}"; @@ -23,5 +27,7 @@ symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; + passthru.unwrapped = qgis-unwrapped; + meta = qgis-unwrapped.meta; } diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index f6e9c881adb..5db9a26ae75 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,8 +1,12 @@ { lib, makeWrapper, symlinkJoin -, qgis-ltr-unwrapped, extraPythonPackages ? (ps: [ ]) +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 }: with lib; -symlinkJoin rec { +let + qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; +in symlinkJoin rec { + inherit (qgis-ltr-unwrapped) version; name = "qgis-${version}"; @@ -22,5 +26,7 @@ symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; + passthru.unwrapped = qgis-ltr-unwrapped; + inherit (qgis-ltr-unwrapped) meta; } |