qgis, qgis-ltr: only expose unwrapped via passthru
This commit is contained in:
parent
85d0a94f90
commit
de256f2c02
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue