fix: recalculate hash
This commit is contained in:
parent
7758be92b4
commit
3f74df0b3a
1 changed files with 15 additions and 13 deletions
28
flake.nix
28
flake.nix
|
|
@ -28,30 +28,35 @@
|
||||||
targets = [ "wasm32-unknown-unknown" ];
|
targets = [ "wasm32-unknown-unknown" ];
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
rustPlatform = pkgs.makeRustPlatform {
|
||||||
|
cargo = rustToolchain;
|
||||||
|
rustc = rustToolchain;
|
||||||
|
};
|
||||||
|
|
||||||
# Stage 1: Build the WASM crate (FOD — network allowed, output content-addressed)
|
cgol-wasm = rustPlatform.buildRustPackage {
|
||||||
cgol-wasm = pkgs.stdenv.mkDerivation {
|
|
||||||
pname = "cgol-wasm";
|
pname = "cgol-wasm";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
src = ./cgol;
|
src = ./cgol;
|
||||||
|
cargoLock.lockFile = ./cgol/Cargo.lock;
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
rustToolchain
|
pkgs.wasm-bindgen-cli
|
||||||
pkgs.wasm-pack
|
|
||||||
pkgs.binaryen
|
pkgs.binaryen
|
||||||
pkgs.cacert
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
export HOME=$TMPDIR
|
runHook preBuild
|
||||||
export SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt
|
cargo build --release --frozen --target wasm32-unknown-unknown
|
||||||
wasm-pack build --release --target web
|
wasm-bindgen --target web --out-dir pkg target/wasm32-unknown-unknown/release/cgol.wasm
|
||||||
wasm-opt pkg/cgol_bg.wasm -o pkg/cgol_bg.wasm -O4 \
|
wasm-opt pkg/cgol_bg.wasm -o pkg/cgol_bg.wasm -O4 \
|
||||||
--enable-bulk-memory --enable-nontrapping-float-to-int \
|
--enable-bulk-memory --enable-nontrapping-float-to-int \
|
||||||
--enable-sign-ext --low-memory-unused --converge
|
--enable-sign-ext --low-memory-unused --converge
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp pkg/cgol_bg.wasm $out/
|
cp pkg/cgol_bg.wasm $out/
|
||||||
cp pkg/cgol.js $out/
|
cp pkg/cgol.js $out/
|
||||||
|
|
@ -68,11 +73,8 @@
|
||||||
"sideEffects": ["./snippets/*"]
|
"sideEffects": ["./snippets/*"]
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputHashAlgo = "sha256";
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
outputHash = "sha256-5Wiyqr9+3lAwelQAGe4VwTkFhEqhXytO0G6hdAIbil0=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Stage 2: Build the website with npm
|
# Stage 2: Build the website with npm
|
||||||
|
|
@ -80,7 +82,7 @@
|
||||||
pname = "jet-website";
|
pname = "jet-website";
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
src = pkgs.lib.cleanSource ./.;
|
src = pkgs.lib.cleanSource ./.;
|
||||||
npmDepsHash = "sha256-hAPfXGje+8pjMRZ5KZKcbu+TgZ9uy+dbYIFVrNQsItg=";
|
npmDepsHash = "sha256-O4ZUSYyVWOxP15saIadsaZuRO47Y0AvsL4pwvo5b76U=";
|
||||||
|
|
||||||
# Inject the Nix-built WASM before npm install resolves file: dep
|
# Inject the Nix-built WASM before npm install resolves file: dep
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue