diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2017-09-10 16:29:39 +0000 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2017-09-10 16:29:39 +0000 |
| commit | 397fc0dacac23515ee09b8de6a14dc9019f325e2 (patch) | |
| tree | e88c547ce59dc57ec5f2356e9856e60853a123e4 /pkgs | |
| parent | 80486ba971e35350c9d5b4dd5684e24a9e49ccea (diff) | |
| download | nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar.gz nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar.bz2 nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar.lz nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar.xz nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.tar.zst nixlib-397fc0dacac23515ee09b8de6a14dc9019f325e2.zip | |
fast-cli: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/node-packages/default-v6.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 27664385b613..334c79a82672 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -53,4 +53,12 @@ nodePackages // { export PATH="$PATH:$tmp" ''; }); + + fast-cli = nodePackages.fast-cli.override (oldAttrs: { + preRebuild = '' + # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore + sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js + ''; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ca1dff970b7..2bf0622e09a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1027,9 +1027,7 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; - fast-cli = nodePackages.fast-cli.overrideDerivation (old: { - buildInputs = old.buildInputs ++ [phantomjs2]; - }); + fast-cli = nodePackages.fast-cli; fd = callPackage ../tools/misc/fd { }; |