From b8abf0e53d0825c2d091b9c3892c77ba8d6f4733 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 23 Dec 2021 22:26:05 +0100 Subject: [PATCH] overlay/plume: properly wasm-pack --- overlay/plume/default.nix | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/overlay/plume/default.nix b/overlay/plume/default.nix index c2883c1f..e58fd274 100644 --- a/overlay/plume/default.nix +++ b/overlay/plume/default.nix @@ -1,6 +1,6 @@ { naersk, fenix , system, stdenv, fetchFromGitHub, buildEnv -, pkg-config, gettext +, pkg-config, gettext, wasm-pack, wasm-bindgen-cli , openssl, postgresql }: @@ -60,6 +60,14 @@ let openssl postgresql ]; + overrideMain = oa: { + installPhase = '' + ${oa.installPhase} + + mkdir -p $out/share/plume + cp -ar static $out/share/plume/ + ''; + }; }; plm = naersk-lib.buildPackage { @@ -80,7 +88,7 @@ let pname = "plume-front"; root = src; nativeBuildInputs = [ - gettext + gettext wasm-pack wasm-bindgen-cli ]; CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; cargoBuildOptions = x: @@ -88,6 +96,26 @@ let "--package=plume-front" ]; copyLibs = true; + overrideMain = oa: { + buildPhase = '' + substituteInPlace plume-front/Cargo.toml \ + --replace '"cdylib"' '"cdylib", "rlib"' + + cat >>plume-front/Cargo.toml <