motiejus/e11sync
1
Fork 0
Code

uwsgi: move package overrides to e11sync-backend

Browse Source
This commit is contained in:
Motiejus Jakštys 2024-01-16 13:31:28 +02:00
parent 74efa197b5
commit d3c5d73198
2 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -63,7 +63,6 @@
e11sync-backend = pkgs.callPackage ./pkgs/e11sync-backend.nix { e11sync-backend = pkgs.callPackage ./pkgs/e11sync-backend.nix {
inherit geoip-mmdb; inherit geoip-mmdb;
uwsgi = pkgs.uwsgi.override {plugins = ["python3"];};
}; };
in { in {
packages = { packages = {

12
pkgs/e11sync-backend.nix
View File

@ -11,8 +11,10 @@
backendPort ? 8002, backendPort ? 8002,
database-path ? null, database-path ? null,
geoip-mmdb, geoip-mmdb,
}: }: let
stdenv.mkDerivation { uwsgi-python = uwsgi.override {plugins = ["python3"];};
in
stdenv.mkDerivation {
name = "e11sync-backend"; name = "e11sync-backend";
propagatedBuildInputs = [ propagatedBuildInputs = [
(python3.withPackages (python3.withPackages
@ -32,10 +34,10 @@ stdenv.mkDerivation {
makeWrapper $out/app/manage.py $out/bin/e11sync \ makeWrapper $out/app/manage.py $out/bin/e11sync \
--set GEOIP_PATH "${geoip-mmdb}" --set GEOIP_PATH "${geoip-mmdb}"
makeWrapper ${uwsgi}/bin/uwsgi $out/bin/e11sync-backend \ makeWrapper ${uwsgi-python}/bin/uwsgi $out/bin/e11sync-backend \
--chdir $out/app \ --chdir $out/app \
--set-default E11SYNC_HTTP_PORT ${toString backendPort} \ --set-default E11SYNC_HTTP_PORT ${toString backendPort} \
--add-flags "--plugin ${uwsgi}/lib/uwsgi/python3_plugin.so" \ --add-flags "--plugin ${uwsgi-python}/lib/uwsgi/python3_plugin.so" \
--add-flags "--http-socket 127.0.0.1:${toString backendPort}" \ --add-flags "--http-socket 127.0.0.1:${toString backendPort}" \
--add-flags "--wsgi-file e11sync/wsgi.py" \ --add-flags "--wsgi-file e11sync/wsgi.py" \
--add-flags --master \ --add-flags --master \
@ -62,4 +64,4 @@ stdenv.mkDerivation {
app/manage.py test app app/manage.py test app
mkdir -p $out mkdir -p $out
''; '';
} }