greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spark-wallet/generate: remove supplement.json

Browse Source 
This file is empty and has no effect.
This commit is contained in:
Erik Arvstedt 2021-03-16 12:45:20 +01:00
parent 84b3217c3d
commit 81db927f66
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/spark-wallet/composition.nix
View File

@ -5,10 +5,6 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
let let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
inherit nodeEnv;
inherit (pkgs) fetchurl fetchgit;
});
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs; inherit nodejs;
@ -17,5 +13,5 @@ let
in in
import ./node-packages.nix { import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit; inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv globalBuildInputs; inherit nodeEnv;
} }

2
pkgs/spark-wallet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgs, lib }: { stdenv, pkgs, lib }:
lib.head (lib.attrValues (import ./composition.nix { lib.head (builtins.attrValues (import ./composition.nix {
inherit pkgs; inherit pkgs;
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
})) }))

2
pkgs/spark-wallet/generate.sh
View File

@ -20,7 +20,7 @@ jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]'
# Run node2nix # Run node2nix
cp pkg.json $TMPDIR/pkg.json 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 # Use verified source in node-packages.nix
url="https://github.com/shesek/spark-wallet/releases/download/v$version/spark-wallet-$version-npm.tgz" url="https://github.com/shesek/spark-wallet/releases/download/v$version/spark-wallet-$version-npm.tgz"

2
pkgs/spark-wallet/supplement.json
View File

@ -1,2 +0,0 @@
[
]