Merge pull request #325731 from fpletz/pkgs/grass-python-311
grass: pin to python 3.11
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, proj
|
||||
, python3Packages
|
||||
, python311Packages
|
||||
, readline
|
||||
, sqlite
|
||||
, wxGTK32
|
||||
@@ -31,6 +31,9 @@
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
pyPackages = python311Packages;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "grass";
|
||||
version = "8.3.2";
|
||||
@@ -53,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libmysqlclient # for `mysql_config`
|
||||
netcdf # for `nc-config`
|
||||
pkg-config
|
||||
] ++ (with python3Packages; [ python-dateutil numpy wxpython ]);
|
||||
] ++ (with pyPackages; [ python-dateutil numpy wxpython ]);
|
||||
|
||||
buildInputs = [
|
||||
blas
|
||||
@@ -86,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Correct mysql_config query
|
||||
postPatch = ''
|
||||
substituteInPlace configure --replace "--libmysqld-libs" "--libs"
|
||||
substituteInPlace configure --replace "--libmysqld-libs" "--libs"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
@@ -127,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/grass \
|
||||
--set PYTHONPATH $PYTHONPATH \
|
||||
--set GRASS_PYTHON ${python3Packages.python.interpreter} \
|
||||
--set GRASS_PYTHON ${pyPackages.python.interpreter} \
|
||||
--suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
|
||||
ln -s $out/grass*/lib $out/lib
|
||||
ln -s $out/grass*/include $out/include
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
, postgresql
|
||||
, proj
|
||||
, protobuf
|
||||
, python3
|
||||
, python311
|
||||
, qca-qt5
|
||||
, qscintilla
|
||||
, qt3d
|
||||
@@ -48,7 +48,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
py = python311.override {
|
||||
packageOverrides = self: super: {
|
||||
pyqt5 = super.pyqt5.override {
|
||||
withLocation = true;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
, postgresql
|
||||
, proj
|
||||
, protobuf
|
||||
, python3
|
||||
, python311
|
||||
, qca-qt5
|
||||
, qscintilla
|
||||
, qt3d
|
||||
@@ -48,7 +48,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
py = python311.override {
|
||||
packageOverrides = self: super: {
|
||||
pyqt5 = super.pyqt5.override {
|
||||
withLocation = true;
|
||||
|
||||
Reference in New Issue
Block a user