From 3a177c6831370811451ca39bad7609aa40a06f44 Mon Sep 17 00:00:00 2001
From: lassulus
Date: Wed, 30 Dec 2020 18:12:44 +0100
Subject: boom, everything is broken

---
 messages/default.nix | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 messages/default.nix

(limited to 'messages/default.nix')

diff --git a/messages/default.nix b/messages/default.nix
new file mode 100644
index 0000000..a1e03b9
--- /dev/null
+++ b/messages/default.nix
@@ -0,0 +1,32 @@
+with (import <nixpkgs> {}); let
+
+in yarn2nix-moretea.mkYarnPackage rec {
+  pname = "workadventuremessages";
+  version = "unstable";
+
+  src = fetchFromGitHub {
+    owner = "thecodingmachine";
+    repo = "workadventure";
+    rev = "284846e8a59ec0d921189ac3a46e0eb5d1e14818";
+    sha256 = "1f1vi226kas7x9y8zw810q5vg1ikn4bb6ha9vnzvqk9y7jlc1n8q";
+  } + "/messages";
+
+  # packageJSON = src + "/back/package.json";
+  # yarnLock = src + "/back/yarn.lock";
+  # NOTE: this is optional and generated dynamically if omitted
+  yarnNix = ./yarn.nix;
+
+  # pkgConfig = {
+  #   grpc = {
+  #     postInstall = ''
+  #       install -D -m755 ${node-grpc-patched}/bin/grpc_node.node src/node/extension_binary/node-v72-linux-x64-glibc/grpc_node.node
+  #    '';
+  #   };
+  # };
+
+  buildPhase = ''
+    mkdir -p $out
+    HOME=$TMPDIR yarn --offline proto
+    find
+  '';
+}
-- 
cgit v1.2.3


From 46954de8bc07649bd2337abdea109930c3e4f7ad Mon Sep 17 00:00:00 2001
From: Sandro Jäckel
Date: Thu, 31 Dec 2020 21:46:39 +0100
Subject: Add front, fix back

---
 messages/default.nix | 56 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'messages/default.nix')

diff --git a/messages/default.nix b/messages/default.nix
index a1e03b9..4b1e734 100644
--- a/messages/default.nix
+++ b/messages/default.nix
@@ -1,6 +1,29 @@
-with (import <nixpkgs> {}); let
+with (import <nixpkgs> { }); let
+  node-protoc-precompiled = pkgs.fetchzip {
+    name = "node-protoc-precompiled";
+    url = "https://node-precompiled-binaries.grpc.io/grpc-tools/v1.10.0/linux-x64.tar.gz";
+    sha256 = "0dl1anpw3610q58mxf7r9dcp768krwvpa4053cjxn5r8b5xfbh4l";
+  };
 
-in yarn2nix-moretea.mkYarnPackage rec {
+  node-protoc-patched = pkgs.stdenv.mkDerivation {
+    name = "node-protoc";
+    buildInputs = [ pkgs.gcc-unwrapped.lib ];
+    nativeBuildInputs = [ pkgs.autoPatchelfHook ];
+    dontAutoPatchelf = true;
+    dontUnpack = true;
+    # protoc: symbol lookup error: /nix/store/...-node-protoc/bin/protoc: undefined symbol: , version
+    dontStrip = true;
+    installPhase = ''
+      install -D -m755 ${node-protoc-precompiled}/grpc_node_plugin $out/bin/grpc_node_plugin
+      install -D -m755 ${node-protoc-precompiled}/protoc $out/bin/protoc
+
+      autoPatchelf $out/bin/{grpc_node_plugin,protoc}
+      :
+    '';
+  };
+
+in
+yarn2nix-moretea.mkYarnPackage rec {
   pname = "workadventuremessages";
   version = "unstable";
 
@@ -11,22 +34,29 @@ in yarn2nix-moretea.mkYarnPackage rec {
     sha256 = "1f1vi226kas7x9y8zw810q5vg1ikn4bb6ha9vnzvqk9y7jlc1n8q";
   } + "/messages";
 
-  # packageJSON = src + "/back/package.json";
-  # yarnLock = src + "/back/yarn.lock";
   # NOTE: this is optional and generated dynamically if omitted
   yarnNix = ./yarn.nix;
 
-  # pkgConfig = {
-  #   grpc = {
-  #     postInstall = ''
-  #       install -D -m755 ${node-grpc-patched}/bin/grpc_node.node src/node/extension_binary/node-v72-linux-x64-glibc/grpc_node.node
-  #    '';
-  #   };
-  # };
+  pkgConfig = {
+    grpc-tools = {
+      postInstall = ''
+        install -D -m755 ${node-protoc-patched}/bin/grpc_node_plugin bin/grpc_node_plugin
+        install -D -m755 ${node-protoc-patched}/bin/protoc bin/protoc
+      '';
+    };
+  };
+
+  dontStrip = true;
 
   buildPhase = ''
     mkdir -p $out
-    HOME=$TMPDIR yarn --offline proto
-    find
+    HOME=$TMPDIR yarn --offline run proto
+  '';
+
+  distPhase = ":";
+
+  installPhase = ''
+    cp -r deps/workadventure-messages/generated $out/
+    cp -r node_modules $out/
   '';
 }
-- 
cgit v1.2.3


From c5342ed3feda6f6f427fdea65a24f1ac86b3c2cc Mon Sep 17 00:00:00 2001
From: Serge Bazanski
Date: Fri, 1 Jan 2021 22:13:39 +0100
Subject: Switch to callPackage

---
 messages/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'messages/default.nix')

diff --git a/messages/default.nix b/messages/default.nix
index 4b1e734..f397b1d 100644
--- a/messages/default.nix
+++ b/messages/default.nix
@@ -1,14 +1,22 @@
-with (import <nixpkgs> { }); let
-  node-protoc-precompiled = pkgs.fetchzip {
+{ stdenv
+, autoPatchelfHook
+, fetchFromGitHub
+, fetchzip
+, gcc-unwrapped
+, yarn2nix-moretea
+, ... }:
+
+let
+  node-protoc-precompiled = fetchzip {
     name = "node-protoc-precompiled";
     url = "https://node-precompiled-binaries.grpc.io/grpc-tools/v1.10.0/linux-x64.tar.gz";
     sha256 = "0dl1anpw3610q58mxf7r9dcp768krwvpa4053cjxn5r8b5xfbh4l";
   };
 
-  node-protoc-patched = pkgs.stdenv.mkDerivation {
+  node-protoc-patched = stdenv.mkDerivation {
     name = "node-protoc";
-    buildInputs = [ pkgs.gcc-unwrapped.lib ];
-    nativeBuildInputs = [ pkgs.autoPatchelfHook ];
+    buildInputs = [ gcc-unwrapped.lib ];
+    nativeBuildInputs = [ autoPatchelfHook ];
     dontAutoPatchelf = true;
     dontUnpack = true;
     # protoc: symbol lookup error: /nix/store/...-node-protoc/bin/protoc: undefined symbol: , version
-- 
cgit v1.2.3


From fedeaa88fc6347103706f65d666f6612987d7cec Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Thu, 25 Feb 2021 17:57:18 +0100
Subject: Update to Version v1.1.0 of workadventure

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

(limited to 'messages/default.nix')

diff --git a/messages/default.nix b/messages/default.nix
index f397b1d..bf9a687 100644
--- a/messages/default.nix
+++ b/messages/default.nix
@@ -38,8 +38,8 @@ yarn2nix-moretea.mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "thecodingmachine";
     repo = "workadventure";
-    rev = "284846e8a59ec0d921189ac3a46e0eb5d1e14818";
-    sha256 = "1f1vi226kas7x9y8zw810q5vg1ikn4bb6ha9vnzvqk9y7jlc1n8q";
+    rev = "v1.1.0";
+    sha256 = "0q4mf16r785aa4f47npmmmhbg6spadnliyi1fk4s4pcjqajgf45f";
   } + "/messages";
 
   # NOTE: this is optional and generated dynamically if omitted
-- 
cgit v1.2.3


From 7ec4c291d8ec93bc205af5c238dfe6a5176f4da4 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Thu, 25 Feb 2021 18:08:52 +0100
Subject: Bump to current master version of tcm workadventure

Builds fine, let's see if anything else works!
---
 messages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'messages/default.nix')

diff --git a/messages/default.nix b/messages/default.nix
index bf9a687..6deb9f7 100644
--- a/messages/default.nix
+++ b/messages/default.nix
@@ -38,8 +38,8 @@ yarn2nix-moretea.mkYarnPackage rec {
   src = fetchFromGitHub {
     owner = "thecodingmachine";
     repo = "workadventure";
-    rev = "v1.1.0";
-    sha256 = "0q4mf16r785aa4f47npmmmhbg6spadnliyi1fk4s4pcjqajgf45f";
+    rev = "6e9c71598004dc9cbab9418efb3c0ac892da7ca2";
+    sha256 = "0rvra0dy631al4aylacyqldkyd6biawz2shsikgcy30nv5lzc78c";
   } + "/messages";
 
   # NOTE: this is optional and generated dynamically if omitted
-- 
cgit v1.2.3