JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fast-cli: fix build

Browse Source
This commit is contained in:
Sander van der Burg 2017-09-10 16:29:39 +00:00
parent 80486ba971
commit 397fc0daca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/node-packages/default-v6.nix
View File

@ -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 ];
});
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };