Backport emscripten 3.1.10 for deterministic builds

This commit is contained in:
Faye Duxovni 2022-05-12 15:20:36 -04:00
parent a4a700739e
commit 52bb29759e
2 changed files with 20 additions and 1 deletions

View file

@ -31,6 +31,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-emscripten": {
"locked": {
"lastModified": 1652377891,
"narHash": "sha256-voVwmhzYFUKo4y98ZF7ZiKnku1ga1nRbbJEeXd0EKKE=",
"owner": "duxovni",
"repo": "nixpkgs",
"rev": "7f75c03d0af88e5de5ead83a90484fd20512d35e",
"type": "github"
},
"original": {
"owner": "duxovni",
"ref": "emscripten",
"repo": "nixpkgs",
"type": "github"
}
},
"npmlock2nix": { "npmlock2nix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -51,6 +67,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-emscripten": "nixpkgs-emscripten",
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
} }
} }

View file

@ -2,6 +2,7 @@
description = "An implementation of the Double Ratchet cryptographic ratchet"; description = "An implementation of the Double Ratchet cryptographic ratchet";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixpkgs-emscripten.url = "github:duxovni/nixpkgs/emscripten";
# We can't use the current stable release because of # We can't use the current stable release because of
# https://github.com/emscripten-core/emscripten/issues/14995 # https://github.com/emscripten-core/emscripten/issues/14995
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
@ -10,7 +11,7 @@
flake = false; flake = false;
}; };
outputs = { self, nixpkgs, flake-utils, npmlock2nix }: outputs = { self, nixpkgs, nixpkgs-emscripten, flake-utils, npmlock2nix }:
( (
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
@ -19,6 +20,7 @@
overlays = [ overlays = [
(final: prev: { (final: prev: {
npmlock2nix = final.callPackage npmlock2nix {}; npmlock2nix = final.callPackage npmlock2nix {};
inherit (import nixpkgs-emscripten { inherit (prev) system config; }) emscripten;
}) })
]; ];
}; };