From 6908ecac521c0ddf3d8af75adefa7209f7a8719c Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 9 Mar 2021 15:38:16 +0100 Subject: Added hasi workadventure version wapkgs.nix new contains packages for several different versions of workadventure (so far hasi + thecodingmachine), which can both be used. Unfortunately, this appears to require some weird hacks to convince nix to sort out the dependencies without having to actually duplicate all the packaging code, but it works. --- pusher/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pusher/default.nix') diff --git a/pusher/default.nix b/pusher/default.nix index cb6ee0d..64d0fdb 100644 --- a/pusher/default.nix +++ b/pusher/default.nix @@ -1,4 +1,4 @@ -workadventuresrc: +workadventuresrc: waname: { stdenv , autoPatchelfHook @@ -34,8 +34,9 @@ let in yarn2nix-moretea.mkYarnPackage rec { - pname = "workadventurepusher"; + pname = "workadventurepusher-${waname}"; version = "unstable"; + name = pname + "-" + version; src = "${workadventuresrc}/pusher"; @@ -68,7 +69,7 @@ yarn2nix-moretea.mkYarnPackage rec { # 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}" \ + makeWrapper '${nodejs-14_x}/bin/node' "$out/bin/workadventurepusher" \ --set NODE_PATH $out/libexec/workadventureback/node_modules \ --prefix PATH : ${lib.makeBinPath [ getconf ]} \ --add-flags "$out/dist/server.js" -- cgit v1.2.3