From b4bfd52e7c27141890a16f913c7a5873fc5a06ef Mon Sep 17 00:00:00 2001
From: Finn Behrens
Date: Thu, 21 Jan 2021 12:03:24 +0100
Subject: create overlay and move everything into workadventure.*

---
 pusher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pusher')

diff --git a/pusher/default.nix b/pusher/default.nix
index a5b84d5..bdace68 100644
--- a/pusher/default.nix
+++ b/pusher/default.nix
@@ -8,7 +8,7 @@
 , nodejs-14_x
 , yarn2nix-moretea
 
-, workadventure-messages
+, workadventure
 }:
 
 let
@@ -62,7 +62,7 @@ yarn2nix-moretea.mkYarnPackage rec {
 
   buildPhase = ''
     mkdir -p $out
-    ln -s ${workadventure-messages.outPath}/generated deps/workadventureback/src/Messages/generated
+    ln -s ${workadventure.messages.outPath}/generated deps/workadventureback/src/Messages/generated
     HOME=$TMPDIR yarn --offline run tsc
     cp -r deps/workadventureback/dist $out/dist
   '';
-- 
cgit v1.2.3


From e5859bb3258351c19540eedd6a8d1dff14af1295 Mon Sep 17 00:00:00 2001
From: Piotr Dobrowolski
Date: Sun, 24 Jan 2021 17:34:30 +0100
Subject: back,pusher: reduce final derivation size

While this still is a major hack, this reduces unused node_modules
(about 200MB each) being pulled in from workadventure*-modules-* and
workadventure-messages.
---
 pusher/default.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pusher')

diff --git a/pusher/default.nix b/pusher/default.nix
index bdace68..44c4c68 100644
--- a/pusher/default.nix
+++ b/pusher/default.nix
@@ -60,11 +60,14 @@ yarn2nix-moretea.mkYarnPackage rec {
 
   dontStrip = true;
 
+  # workadventureback below is a package name extracted from package.json,
+  # intended until upstream fixes that up.
   buildPhase = ''
     mkdir -p $out
     ln -s ${workadventure.messages.outPath}/generated deps/workadventureback/src/Messages/generated
     HOME=$TMPDIR yarn --offline run tsc
     cp -r deps/workadventureback/dist $out/dist
+    rm -rf deps/workadventureback/{src,node_modules}
   '';
 
   postInstall = ''
-- 
cgit v1.2.3


From 2d7380043979b6bc8e05cecda9d6277e1553777f Mon Sep 17 00:00:00 2001
From: Piotr Dobrowolski
Date: Sun, 24 Jan 2021 17:37:03 +0100
Subject: back,pusher: fix node-pre-gyp libc detection

This should fix libc detection carried out in
https://github.com/lovell/detect-libc/blob/5173db0bc47608f89986d9125c2d868c08d5f429/lib/detect-libc.js#L44
when loading grpc bindings.
---
 pusher/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pusher')

diff --git a/pusher/default.nix b/pusher/default.nix
index 44c4c68..1c41765 100644
--- a/pusher/default.nix
+++ b/pusher/default.nix
@@ -1,6 +1,8 @@
 { stdenv
 , autoPatchelfHook
 , makeWrapper
+, lib
+, getconf
 
 , fetchzip
 , fetchFromGitHub
@@ -72,8 +74,11 @@ yarn2nix-moretea.mkYarnPackage rec {
 
   postInstall = ''
     # node-abi needs to the abi of the node here
+    # getconf is required for detect-libc (used by node-pre-gyp) to properly
+    # detect current libc
     makeWrapper '${nodejs-14_x}/bin/node' "$out/bin/${pname}" \
       --set NODE_PATH $out/libexec/workadventureback/node_modules \
+      --prefix PATH : ${lib.makeBinPath [ getconf ]} \
       --add-flags "$out/dist/server.js"
   '';
 }
-- 
cgit v1.2.3