From 18331b243985af35bad029a88ea012fbf42e1588 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Fri, 1 Nov 2024 20:47:34 +0100
Subject: [PATCH] akkoma-frontends: use finalAttrs pattern

Also replace remaining uses of with lib;
---
 pkgs/servers/akkoma/admin-fe/default.nix  | 14 +++++++-------
 pkgs/servers/akkoma/akkoma-fe/default.nix | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix
index 556525675658..c39b8dfd706c 100644
--- a/pkgs/servers/akkoma/admin-fe/default.nix
+++ b/pkgs/servers/akkoma/admin-fe/default.nix
@@ -6,7 +6,7 @@
 , python3, pkg-config, libsass
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "admin-fe";
   version = "unstable-2024-04-27";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-acF+YuWXlMZMipD5+XJS+K9vVFRz3wB2fZqc3Hd0Bjc=";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
     export HOME="$(mktemp -d)"
 
-    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache}
+    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache}
     fixup-yarn-lock yarn.lock
     substituteInPlace yarn.lock \
       --replace-fail '"git://github.com/adobe-webplatform/eve.git#eef80ed"' '"https://github.com/adobe-webplatform/eve.git#eef80ed"'
@@ -73,10 +73,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Admin interface for Akkoma";
     homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ mvs ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ mvs ];
   };
-}
+})
diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix
index 4c3da1ed9d42..1ea4bc34cbec 100644
--- a/pkgs/servers/akkoma/akkoma-fe/default.nix
+++ b/pkgs/servers/akkoma/akkoma-fe/default.nix
@@ -5,7 +5,7 @@
 , jpegoptim, oxipng, nodePackages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "akkoma-fe";
   version = "3.11.0";
 
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     domain = "akkoma.dev";
     owner = "AkkomaGang";
     repo = "akkoma-fe";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ=";
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
+    yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-Uet3zdjLdI4qpiuU4CtW2WwWGcFaOhotLLKfnsAUqho=";
   };
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # Build scripts assume to be used within a Git repository checkout
-    sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${builtins.substring 0 7 src.rev}";' \
+    sed -E -i '/^let commitHash =/,/;$/clet commitHash = "${builtins.substring 0 7 finalAttrs.src.rev}";' \
       build/webpack.prod.conf.js
   '';
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     export HOME="$(mktemp -d)"
 
-    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg offlineCache}
+    yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache}
     fixup-yarn-lock yarn.lock
 
     yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
@@ -73,10 +73,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Frontend for Akkoma";
     homepage = "https://akkoma.dev/AkkomaGang/akkoma-fe/";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ mvs ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ mvs ];
   };
-}
+})