From 81db927f6638eb0b77e8272764dc822bba7bfb0d Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Tue, 16 Mar 2021 12:45:20 +0100
Subject: [PATCH] spark-wallet/generate: remove supplement.json

This file is empty and has no effect.
---
 pkgs/spark-wallet/composition.nix | 6 +-----
 pkgs/spark-wallet/default.nix     | 2 +-
 pkgs/spark-wallet/generate.sh     | 2 +-
 pkgs/spark-wallet/supplement.json | 2 --
 4 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 pkgs/spark-wallet/supplement.json

diff --git a/pkgs/spark-wallet/composition.nix b/pkgs/spark-wallet/composition.nix
index 5d13a8b..dd99c0a 100644
--- a/pkgs/spark-wallet/composition.nix
+++ b/pkgs/spark-wallet/composition.nix
@@ -5,10 +5,6 @@
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
-  globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
-    inherit nodeEnv;
-    inherit (pkgs) fetchurl fetchgit;
-  });
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
@@ -17,5 +13,5 @@ let
 in
 import ./node-packages.nix {
   inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv globalBuildInputs;
+  inherit nodeEnv;
 }
\ No newline at end of file
diff --git a/pkgs/spark-wallet/default.nix b/pkgs/spark-wallet/default.nix
index f4502b9..ea6f456 100644
--- a/pkgs/spark-wallet/default.nix
+++ b/pkgs/spark-wallet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgs, lib }:
-lib.head (lib.attrValues (import ./composition.nix {
+lib.head (builtins.attrValues (import ./composition.nix {
     inherit pkgs;
     inherit (stdenv.hostPlatform) system;
 }))
diff --git a/pkgs/spark-wallet/generate.sh b/pkgs/spark-wallet/generate.sh
index 124304c..84434d9 100755
--- a/pkgs/spark-wallet/generate.sh
+++ b/pkgs/spark-wallet/generate.sh
@@ -20,7 +20,7 @@ jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]'
 
 # Run node2nix
 cp pkg.json $TMPDIR/pkg.json
-node2nix --nodejs-10 -i $TMPDIR/pkg.json -c composition.nix --no-copy-node-env --supplement-input supplement.json
+node2nix --nodejs-10 -i $TMPDIR/pkg.json -c composition.nix --no-copy-node-env
 
 # Use verified source in node-packages.nix
 url="https://github.com/shesek/spark-wallet/releases/download/v$version/spark-wallet-$version-npm.tgz"
diff --git a/pkgs/spark-wallet/supplement.json b/pkgs/spark-wallet/supplement.json
deleted file mode 100644
index 0d4f101..0000000
--- a/pkgs/spark-wallet/supplement.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]