Fix the "psycopg" issue and make tests run without setting PYTHONPATH #339

Signed-off-by: Chin Yeung Li <tli@nexb.com>

Author: chinyeungli

etc/scripts/build_nix_docker.py

@@ -92,6 +92,7 @@ def read_pyproject_toml():
 
     return pyproject_data
 
+
 def extract_project_meta(pyproject_data):
     # Extract project metadata from pyproject.toml data.
     project_data = pyproject_data["project"]
@@ -194,13 +195,16 @@ def create_defualt_nix(dependencies_list, meta_dict):
     else:
         python_use = f"python{py_version_major}{py_version_minor}"
     # Create a default.nix
-    nix_content = """
+    nix_content = (
+        """
 {
   pkgs ? import <nixpkgs> { },
 }:
 
 let
-  python = pkgs.""" + python_use + """;
+  python = pkgs."""
+        + python_use
+        + """;
 
   # Helper function to create packages with specific versions and disabled tests
   buildCustomPackage = { pname, version, format ? "wheel", src, ... }@attrs:
@@ -215,6 +219,14 @@ def create_defualt_nix(dependencies_list, meta_dict):
           ];
           buildInputs = with pkgs; [ openldap cyrus_sasl ];
         };
+        psycopg = {
+          nativeBuildInputs = with pkgs; [
+            pkg-config
+          ];
+          buildInputs = with pkgs; [
+            postgresql
+          ];
+        };
       };
 
       # Get the special build inputs for this package, or empty if none
@@ -230,6 +242,7 @@ def create_defualt_nix(dependencies_list, meta_dict):
 
   pythonOverlay = self: super: {
 """
+    )
     need_review_packages_list = []
     deps_size = len(dependencies_list)
     for idx, dep in enumerate(dependencies_list):
@@ -366,17 +379,30 @@ def create_defualt_nix(dependencies_list, meta_dict):
       setuptools
       wheel
       pip
+      pkgs.pkg-config
+      pkgs.makeWrapper
     ];
 
     # Add PostgreSQL to buildInputs to ensure libpq is available at runtime
     buildInputs = with pkgs; [
       postgresql
     ];
 
-    # This wrapper ensures the PostgreSQL libraries are available at runtime
-    makeWrapperArgs = [
-      "--set LD_LIBRARY_PATH ${pkgs.postgresql.lib}/lib"
-    ];
+    # Ensure proper runtime setup.
+    postInstall = ''
+      # Create source directory like RPM does (for source access)
+      mkdir -p $out/src
+      cp -r ${./.}/* $out/src/ 2>/dev/null || true
+
+      # Remove build artifacts from source copy
+      rm -rf $out/src/dist $out/src/build $out/src/result $out/src/default.nix 2>/dev/null || true
+
+      # Wrap the dejacode executable to set up the runtime environment
+      wrapProgram $out/bin/dejacode \
+          --set PYTHONPATH "$out/src:$out/lib/python*/site-packages" \
+          --set LD_LIBRARY_PATH "${pkgs.postgresql.lib}/lib:$LD_LIBRARY_PATH" \
+          --run "cd $out/src"
+    '';
 
     propagatedBuildInputs = with pythonWithOverlay.pkgs; [
 """