Merge pull request #522 from imincik/grass-addons-geonix-attrset

grass-plugins: pass geonix python packages as attrset
imincik · Aug 29, 2024 · 154ef84 · 154ef84
2 parents d396120 + c39c9d5
commit 154ef84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -240,7 +240,7 @@
                         plugin = value;
 
                         inherit grass;
-                        python3-gdal = python-packages.python3.gdal;
+                        geopkgs-python3 = python-packages.python3;
                       };
                     }
                   )

diff --git a/pkgs/grass/plugins.nix b/pkgs/grass/plugins.nix
@@ -15,7 +15,8 @@
 , pkg-config
 , postgresql
 , python3
-, python3-gdal
+
+, geopkgs-python3
 }:
 
 let
@@ -54,9 +55,10 @@ stdenv.mkDerivation {
     # python
     matplotlib
     numpy
-    python3-gdal
     six
-  ];
+  ] ++ (with geopkgs-python3; [
+    gdal
+  ]);
 
   # extra plugin dependencies (both Python and non-python)
   propagatedBuildInputs = with python3.pkgs; [ ]
@@ -66,7 +68,7 @@ stdenv.mkDerivation {
     ++ lib.optionals (name == "r-edm-eval") [ pandas ]
     ++ lib.optionals (name == "i-eodag") [ pytz ]
     ++ lib.optionals (name == "wx-metadata") [ wxpython ]
-    ++ lib.optionals (name == "r-in-vect") [ python3-gdal ]
+    ++ lib.optionals (name == "r-in-vect") [ (geopkgs-python3.gdal) ]
     ++ lib.optionals (name == "i-landsat") [ pyyaml]
     # ++ lib.optionals (name == "i-sentinel") [ pystac ]