From de256f2c029238e60a4be5bec42db6c7c86f3e0e Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:16:18 -0500
Subject: [PATCH] qgis, qgis-ltr: only expose unwrapped via passthru

---
 pkgs/applications/gis/grass/default.nix |  2 +-
 pkgs/applications/gis/qgis/default.nix  | 10 ++++++++--
 pkgs/applications/gis/qgis/ltr.nix      | 10 ++++++++--
 pkgs/top-level/all-packages.nix         |  4 ----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 7ba2dc5c8ff4..16e6a818e5ae 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 43598bc852f9..b3220f8d7081 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 f6e9c881adb9..5db9a26ae758 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;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81b6e55c7bcb..df8625f44ab4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28257,12 +28257,8 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
 
-  qgis-ltr-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped-ltr.nix { };
-
   qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };
 
-  qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { };
-
   qgis = callPackage ../applications/gis/qgis { };
 
   qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { };