diff --git a/module.nix b/module.nix index 53e78bc..7803b2c 100644 --- a/module.nix +++ b/module.nix @@ -32,7 +32,7 @@ in type = "normal"; chdir = "${pkgs.fragdenrat}/share/fragdenrat"; - # Use absolute wsgi entrypoint to avoid module resolution issues + # Absolute WSGI entrypoint wsgi-file = "${pkgs.fragdenrat}/share/fragdenrat/wsgi.py"; callable = "application"; @@ -50,14 +50,15 @@ in "no-orphans" = true; env = [ - # Ensure python sees the app and dependencies - "PYTHONPATH=${pkgs.fragdenrat}/share/fragdenrat:${pkgs.fragdenrat.pythonPath}" + # Parent dir must be on sys.path so `import fragdenrat` resolves + "PYTHONPATH=${pkgs.fragdenrat}/share:${pkgs.fragdenrat.pythonPath}" "DJANGO_SETTINGS_MODULE=fragdenrat.settings" ]; settings = { "static-map" = "/static=${pkgs.fragdenrat}/share/fragdenrat/assets"; - pythonpath = "${pkgs.fragdenrat}/share/fragdenrat"; + # Mirror PYTHONPATH for uWSGI setting + pythonpath = "${pkgs.fragdenrat}/share"; }; }; }; diff --git a/result b/result index d20d10b..430629b 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/kd30zy3wz9a81qh1iwpqxwky7y6gbnzd-fragdenrat-0.1.0 \ No newline at end of file +/nix/store/jsjajfw1bbm7h28fh8q64zignm6z09yn-fragdenrat-0.1.0 \ No newline at end of file