c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

overlay/plume: 0.7.0 -> 0.7.1

This commit is contained in:
Astro 2022-02-24 18:50:41 +01:00
parent f92ba3d020
commit 577d3c89f5
2 changed files with 1373 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1893
overlay/plume/0001-cargo-update.patch
View File

File diff suppressed because it is too large Load Diff

21
overlay/plume/default.nix
View File

@ -1,6 +1,6 @@
{ naersk, fenix { naersk, fenix
, stdenv, fetchFromGitHub, buildEnv , stdenv, fetchFromGitHub, buildEnv
, pkg-config, gettext, wasm-pack, wasm-bindgen-cli , pkg-config, gettext, wasm-pack, wasm-bindgen-cli, binaryen
, openssl, postgresql , openssl, postgresql
}: }:
@ -31,7 +31,7 @@ let
sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6"; sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6";
}; };
version = "0.7.0"; version = "0.7.1";
src = stdenv.mkDerivation { src = stdenv.mkDerivation {
pname = "plume-src"; pname = "plume-src";
@ -40,7 +40,7 @@ let
owner = "Plume-org"; owner = "Plume-org";
repo = "Plume"; repo = "Plume";
rev = version; rev = version;
sha256 = "00hl81dvcybbybwfha7x2y8mz4qlmqip76610va73j6xcjsvj4fq"; sha256 = "01mgg9ngpjinlwbgm2s287namilm3ddlwpn0hjs6267608vjgi04";
}; };
phases = [ "unpackPhase" "patchPhase" "installPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patches = [ patches = [
@ -91,7 +91,7 @@ let
pname = "plume-front"; pname = "plume-front";
root = src; root = src;
nativeBuildInputs = [ nativeBuildInputs = [
gettext wasm-pack wasm-bindgen-cli gettext wasm-pack wasm-bindgen-cli binaryen
]; ];
CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
cargoBuildOptions = x: cargoBuildOptions = x:
@ -101,20 +101,9 @@ let
copyLibs = true; copyLibs = true;
overrideMain = oa: { overrideMain = oa: {
buildPhase = '' buildPhase = ''
substituteInPlace plume-front/Cargo.toml \ wasm-pack build --mode no-install --target web --release plume-front
--replace '"cdylib"' '"cdylib", "rlib"'
cat >>plume-front/Cargo.toml <<EOF
[package.metadata.wasm-pack.profile.release]
# wasm-opt is missing from nixpkgs
wasm-opt = false
EOF
wasm-pack build --target web --release plume-front
''; '';
installPhase = '' installPhase = ''
${oa.installPhase}
mkdir -p $out/share/plume/static mkdir -p $out/share/plume/static
cp -a plume-front/pkg/*.{js,ts,wasm} $out/share/plume/static/ cp -a plume-front/pkg/*.{js,ts,wasm} $out/share/plume/static/
''; '';