draupnir: Add recommended change

NixOS · Nov 29, 2023 · c7140dd · c7140dd
1 parent 4367c4e
commit c7140dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -15593,19 +15593,19 @@
       fingerprint = "1401 1B63 393D 16C1 AA9C  C521 8526 B757 4A53 6236";
     }];
   };
-  rossabaker = {
-    name = "Ross A. Baker";
-    email = "ross@rossabaker.com";
-    github = "rossabaker";
-    githubId = 142698;
-  };
   Rory = {
     email = "root@rory.gay";
     github = "TheArcaneBrony";
     githubId = 13570458;
     matrix = "@emma:rory.gay"; # This is going to change soon...
     name = "Rory";
   };
+  rossabaker = {
+    name = "Ross A. Baker";
+    email = "ross@rossabaker.com";
+    github = "rossabaker";
+    githubId = 142698;
+  };
   RossComputerGuy = {
     name = "Tristan Ross";
     email = "tristan.ross@midstall.com";

diff --git a/pkgs/servers/draupnir/default.nix b/pkgs/servers/draupnir/default.nix
@@ -1,10 +1,10 @@
 { lib
-, nixosTests
 , stdenv
 , fetchFromGitHub
 , makeWrapper
 , nodejs
-, pkgs
+, yarn
+, matrix-sdk-crypto-nodejs
 , mkYarnPackage
 , fetchYarnDeps
 }:
@@ -25,8 +25,8 @@ mkYarnPackage rec {
   nativeBuildInputs = [
     nodejs
     makeWrapper
-    pkgs.yarn
-    pkgs.matrix-sdk-crypto-nodejs
+    yarn
+    matrix-sdk-crypto-nodejs
   ];
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
@@ -44,7 +44,7 @@ mkYarnPackage rec {
       yarn --offline --verbose build
       # copy built modules to package...
       echo "Copying built matrix-sdk-crypto-nodejs modules to package..."
-      cp -a ${pkgs.matrix-sdk-crypto-nodejs}/lib/node_modules/* node_modules/
+      cp -a ${matrix-sdk-crypto-nodejs}/lib/node_modules/* node_modules/
       echo "Adding version.txt..."
       mkdir -p deps/draupnir/
       echo "${version}-nix" > deps/draupnir/version.txt