Merge remote-tracking branch 'origin/trunk' into enable-wasm-tests

This commit is contained in:
Folkert 2021-09-01 19:54:40 +02:00
commit 5076ba47ee
2 changed files with 3 additions and 6 deletions

View file

@ -2,12 +2,11 @@
pkgs.stdenv.mkDerivation {
name = "debugir";
# we can go back to upstream when https://github.com/vaivaswatha/debugir/pull/4 gets merged
src = pkgs.fetchFromGitHub {
owner = "Arkham";
owner = "vaivaswatha";
repo = "debugir";
rev = "8d543e8796a1ab28ebf708e8e6883a574dd5e48c";
sha256 = "10sz3jwfkmqbp91d5aj9wd79k0cksl9qh4hirlivfyw8dcmbk384";
rev = "db871e6cee7f653e284b226e2567a2574635247c";
sha256 = "0rgh9gawf92mjya1plxlgi9azkwca3gq8qa5hri18k4b7sbjm6lx";
};
buildInputs = with pkgs; [ cmake libxml2 llvmPackages_12.llvm.dev ];
buildPhase = ''

View file

@ -50,8 +50,6 @@ let
zig
# lib deps
llvmPkgs.libcxx
llvmPkgs.libcxxabi
libffi
libxml2
ncurses