From 227f27d620e69ea90f16331c83003bb2e004c356 Mon Sep 17 00:00:00 2001
From: Paul Driver <frodwith@gmail.com>
Date: Sat, 10 Oct 2020 18:04:26 -0700
Subject: [PATCH] remove scrypt from urbit build (in urcrypt now)

---
 nix/pkgs/urbit/default.nix | 4 ++--
 nix/pkgs/urbit/shell.nix   | 2 +-
 pkg/urbit/configure        | 2 +-
 pkg/urbit/jets/e/scr.c     | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nix/pkgs/urbit/default.nix b/nix/pkgs/urbit/default.nix
index bd168d60f..e89d501b7 100644
--- a/nix/pkgs/urbit/default.nix
+++ b/nix/pkgs/urbit/default.nix
@@ -1,7 +1,7 @@
 {
   pkgs,
   debug,
-  argon2, ed25519, ent, urcrypt, libaes_siv, h2o, murmur3, scrypt, secp256k1, softfloat3, uv, ivory-header, ca-header
+  argon2, ed25519, ent, urcrypt, libaes_siv, h2o, murmur3, secp256k1, softfloat3, uv, ivory-header, ca-header
 }:
 
 let
@@ -26,7 +26,7 @@ let
     [ curl gmp sigseg openssl zlib lmdb ];
 
   vendor =
-    [ argon2 softfloat3 ed25519 ent urcrypt libaes_siv h2o scrypt uv murmur3 secp256k1 ivory-header ca-header ];
+    [ argon2 softfloat3 ed25519 ent urcrypt libaes_siv h2o uv murmur3 secp256k1 ivory-header ca-header ];
 
   urbit = pkgs.stdenv.mkDerivation {
     inherit name meta;
diff --git a/nix/pkgs/urbit/shell.nix b/nix/pkgs/urbit/shell.nix
index 81392a9f3..0aec107b7 100644
--- a/nix/pkgs/urbit/shell.nix
+++ b/nix/pkgs/urbit/shell.nix
@@ -12,5 +12,5 @@ import ./default.nix {
   inherit (tlon)
     ent urcrypt libaes_siv;
   inherit (deps)
-    argon2 ed25519 h2o murmur3 scrypt secp256k1 softfloat3 uv ivory-header ca-header;
+    argon2 ed25519 h2o murmur3 secp256k1 softfloat3 uv ivory-header ca-header;
 }
diff --git a/pkg/urbit/configure b/pkg/urbit/configure
index 597665808..be533cd98 100755
--- a/pkg/urbit/configure
+++ b/pkg/urbit/configure
@@ -7,7 +7,7 @@ URBIT_VERSION="0.10.8"
 pkg_config_deps="liburcrypt"
 
 extra_libs="\
-  urcrypt curl gmp sigsegv ent h2o scrypt uv murmur3 \
+  urcrypt curl gmp sigsegv ent h2o uv murmur3 \
   softfloat3 ssl z lmdb pthread \
 "
 
diff --git a/pkg/urbit/jets/e/scr.c b/pkg/urbit/jets/e/scr.c
index 6d149a635..a64fd58ef 100644
--- a/pkg/urbit/jets/e/scr.c
+++ b/pkg/urbit/jets/e/scr.c
@@ -6,7 +6,6 @@
 
 /* functions
 */
-
   static u3_weak
   _cqes_hs(u3_atom p, c3_w pwd_w,
            u3_atom s, c3_w sal_w,