e11sync

commit 0d31ec7969dc20f1ebbc752a009667ced534942b (tree)
parent 4475a47987cfbc3be86e432baf0bc52af231dfe6
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Tue, 16 Jan 2024 00:09:47 +0200

django: propagate better

Diffstat:
M
modules/e11sync/default.nix
 | 
7
++++++-
M
pkgs/e11sync-backend.nix
 | 
15
+++++++++++----

2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix
@@ -1,6 +1,7 @@
 e11sync-backend: {
   config,
   lib,
+  pkgs,
   ...
 }: {
   options.e11sync = with lib.types; {
@@ -9,6 +10,10 @@ e11sync-backend: {
   };
 
   config = lib.mkIf config.e11sync.enable {
-    environment.systemPackages = [e11sync-backend];
+    environment.systemPackages = [
+      pkgs.python3
+      pkgs.python3Packages.django_5
+      e11sync-backend
+    ];
   };
 }
diff --git a/pkgs/e11sync-backend.nix b/pkgs/e11sync-backend.nix
@@ -3,6 +3,7 @@
   stdenv,
   runCommand,
   makeWrapper,
+  python3,
   python3Packages,
   libmaxminddb,
   dart-sass,
@@ -13,10 +14,16 @@
 }:
 stdenv.mkDerivation {
   name = "e11sync";
-  propagatedBuildInputs = [
-    python3Packages.django_5
-    python3Packages.django-compressor
-    python3Packages.geoip2
+  propagatedBuildInputs = let
+    python = python3.withPackages (ps:
+      with ps; [
+        django_5
+        django-compressor.override
+        {django = django_5;}
+        geoip2
+      ]);
+  in [
+    python
     libmaxminddb
   ];
   nativeBuildInputs = [makeWrapper];