Skip to content

Commit 3a27548

Browse files
committed
use mold and wasm-bindgen from nixpkgs
1 parent 9508f39 commit 3a27548

File tree

2 files changed

+13
-45
lines changed

2 files changed

+13
-45
lines changed

flake.lock

Lines changed: 10 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
inputs = {
33
nixpkgs = {
4-
url = "github:nixos/nixpkgs/nixos-unstable";
4+
url = "github:nixos/nixpkgs/nixos-unstable-small";
55
};
66
flake-utils = {
77
url = "github:numtide/flake-utils";
@@ -48,19 +48,6 @@
4848
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = toString ./. + "/scripts/clang";
4949
CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
5050
buildInputs = with pkgs; [
51-
(stdenv.mkDerivation {
52-
pname = "mold";
53-
version = "0.9.1";
54-
src = fetchgit {
55-
url = "https://github.com/rui314/mold";
56-
rev = "v0.9.1";
57-
sha256 = "sha256-yIkW6OCXhlHZ1jC8/yMAdJbSgY9K40POT2zWv6wYr5E=";
58-
};
59-
nativeBuildInputs = [ clang_12 cmake lld_12 tbb xxHash zlib openssl git ];
60-
dontUseCmakeConfigure = "true";
61-
buildPhase = "make -j $NIX_BUILD_CORES";
62-
installPhase = "mkdir -p $out $out/bin $out/share/man/man1 && PREFIX=$out make install";
63-
})
6451
cachix
6552
cargo-insta
6653
clang_12
@@ -70,6 +57,7 @@
7057
elixir
7158
go
7259
lld_12
60+
mold
7361
nodejs-16_x
7462
python39
7563
rpm
@@ -78,6 +66,7 @@
7866
rust-cbindgen
7967
sequoia
8068
sqlite
69+
wasm-bindgen-cli
8170
];
8271
};
8372
}

0 commit comments

Comments
 (0)