From 5c6f7afda1433d0df6f564f9f89f9aab76aac1fc Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Mon, 15 May 2023 15:40:24 -0700 Subject: [PATCH] lldap: use upstream wasm-pack --- pkgs/servers/ldap/lldap/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 1eb885be7854..011a38f8c53f 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -15,15 +15,6 @@ let - # version of wasm-opt, with https://github.com/rustwasm/wasm-pack/pull/1257 backported - wasm-pack-git = wasm-pack.overrideAttrs (oldAttrs: { - version = oldAttrs.version + "-git"; - patches = [(fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/rustwasm/wasm-pack/pull/1257.patch"; - sha256 = "sha256-npi9ewh0NaD67crTcje9AYxaLLOJOMzqjqEJXZF2LbQ="; - })]; - }); - # replace with upstream wasm rustc, after resolution of # https://github.com/NixOS/nixpkgs/issues/89426 rustc-wasm = (rustc.override { @@ -74,7 +65,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack-git wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld + wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld ]; buildPhase = ''