From a62b50e779b5441ee8994594df78066e386cac38 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 19:33:06 +0800
Subject: [PATCH 1/4] briar-desktop: fix license

Reference: https://code.briarproject.org/briar/briar-desktop/-/blob/main/LICENSE.md
---
 pkgs/by-name/br/briar-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/briar-desktop/package.nix b/pkgs/by-name/br/briar-desktop/package.nix
index 3aa6ac2e5751..3f2e7fbf43aa 100644
--- a/pkgs/by-name/br/briar-desktop/package.nix
+++ b/pkgs/by-name/br/briar-desktop/package.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     description = "Decentralized and secure messenger";
     mainProgram = "briar-desktop";
     homepage = "https://code.briarproject.org/briar/briar-desktop";
-    license = licenses.gpl3;
+    license = licenses.agpl3Plus;
     maintainers = with maintainers; [
       onny
       supinie

From 12da3cd4f42fe1038ea92004b800bfdf147650c2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 19:36:19 +0800
Subject: [PATCH 2/4] briar-desktop: avoid with lib;

Reference: https://github.com/NixOS/nixpkgs/issues/371862
---
 pkgs/by-name/br/briar-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/briar-desktop/package.nix b/pkgs/by-name/br/briar-desktop/package.nix
index 3f2e7fbf43aa..bfbfa88c48b0 100644
--- a/pkgs/by-name/br/briar-desktop/package.nix
+++ b/pkgs/by-name/br/briar-desktop/package.nix
@@ -58,12 +58,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Decentralized and secure messenger";
     mainProgram = "briar-desktop";
     homepage = "https://code.briarproject.org/briar/briar-desktop";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       onny
       supinie
     ];

From 4da2c5e9f3ac7c3ba50f21976d5e8cab4572f864 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 19:38:00 +0800
Subject: [PATCH 3/4] briar-desktop: add ngi team

---
 pkgs/by-name/br/briar-desktop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/br/briar-desktop/package.nix b/pkgs/by-name/br/briar-desktop/package.nix
index bfbfa88c48b0..ce0f1791f339 100644
--- a/pkgs/by-name/br/briar-desktop/package.nix
+++ b/pkgs/by-name/br/briar-desktop/package.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
       onny
       supinie
     ];
+    teams = with lib.teams; [ ngi ];
     platforms = [ "x86_64-linux" ];
   };
 }

From f70e619203921eb575a92ddf8f0cfcee977abfb8 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 19:39:39 +0800
Subject: [PATCH 4/4] briar-desktop: use finalAttrs

Reference: https://github.com/NixOS/nixpkgs/issues/277994
---
 pkgs/by-name/br/briar-desktop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/br/briar-desktop/package.nix b/pkgs/by-name/br/briar-desktop/package.nix
index ce0f1791f339..5683ca610fd8 100644
--- a/pkgs/by-name/br/briar-desktop/package.nix
+++ b/pkgs/by-name/br/briar-desktop/package.nix
@@ -19,12 +19,12 @@ let
   '';
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "briar-desktop";
   version = "0.6.3-beta";
 
   src = fetchurl {
-    url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar";
+    url = "https://desktop.briarproject.org/jars/linux/${finalAttrs.version}/briar-desktop-linux-${finalAttrs.version}.jar";
     hash = "sha256-8JX4cgRJZDCBlu5iVL7t5nZSZn8XTk3DU3rasViQgtg=";
   };
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/{bin,lib}
-    cp ${src} $out/lib/briar-desktop.jar
+    cp ${finalAttrs.src} $out/lib/briar-desktop.jar
     makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \
       --add-flags "-jar $out/lib/briar-desktop.jar" \
       --prefix LD_LIBRARY_PATH : "${
@@ -70,4 +70,4 @@ stdenv.mkDerivation rec {
     teams = with lib.teams; [ ngi ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})