From 5e410d367e55791c3ebcf883dd916d9e7e087de1 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 4 Jun 2026 14:56:38 +0200
Subject: [PATCH 1/2] python3Packages.lxmf: add missing `qrcode` dependency

---
 pkgs/development/python-modules/lxmf/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 81d79182ead4..1f960e7383f7 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  qrcode,
   rns,
   setuptools,
   versionCheckHook,
@@ -24,7 +25,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [ "rns" ];
 
-  dependencies = [ rns ];
+  dependencies = [
+    qrcode
+    rns
+  ];
 
   pythonImportsCheck = [ "LXMF" ];
 

From 55e1858f04d9b2ce28af2e2888299146285e1245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 4 Jun 2026 12:21:10 -0700
Subject: [PATCH 2/2] rns: add optional dependency lxmf

---
 pkgs/by-name/rn/rns/package.nix               | 21 ++++++++++++++++++-
 .../python-modules/lxmf/default.nix           | 12 ++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rn/rns/package.nix b/pkgs/by-name/rn/rns/package.nix
index 2392ffa84691..b8d2c34c937b 100644
--- a/pkgs/by-name/rn/rns/package.nix
+++ b/pkgs/by-name/rn/rns/package.nix
@@ -1 +1,20 @@
-{ python3Packages }: with python3Packages; toPythonApplication rns
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lxmf = super.lxmf.override {
+        propagateRns = false;
+      };
+    }
+  );
+in
+pythonPackages.toPythonApplication (
+  pythonPackages.rns.overridePythonAttrs (old: {
+    dependencies = old.dependencies ++ [
+      pythonPackages.lxmf
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 1f960e7383f7..81de08cf79c3 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -2,6 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  # rns optionally depends on lxmf but we can't have two versions of rns in a closure
+  propagateRns ? false,
   qrcode,
   rns,
   setuptools,
@@ -25,14 +27,22 @@ buildPythonPackage (finalAttrs: {
 
   pythonRelaxDeps = [ "rns" ];
 
+  buildInputs = lib.optionals (!propagateRns) [
+    rns
+  ];
+
   dependencies = [
     qrcode
+  ]
+  ++ lib.optionals propagateRns [
     rns
   ];
 
   pythonImportsCheck = [ "LXMF" ];
 
-  nativeCheckInputs = [ versionCheckHook ];
+  nativeCheckInputs = lib.optionals propagateRns [
+    versionCheckHook
+  ];
 
   meta = {
     description = "Lightweight Extensible Message Format for Reticulum";