Skip to content

Fix shell.nix and build for modern nixpkgs/Node.js #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brysenPfingsten wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix shell.nix and build for modern nixpkgs/Node.js #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion APIServer/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if [ $needsBuild -eq 1 ]; then
echo "could install depenencies, is yarn instlled?"
exit 1
)
yarn run grunt ||
NODE_OPTIONS=--openssl-legacy-provider yarn run grunt ||
(
echo "could not build the server"
exit 1
Expand Down
23 changes: 2 additions & 21 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
{ pkgs ? import <nixpkgs> { }, stdenv ? pkgs.stdenv }:
let
xvfb-run-stderr = pkgs.xvfb_run.overrideAttrs (drv: {
# Patch the wrapped program by appending this to the buildCommand
buildCommand = drv.buildCommand + ''

patch $out/bin/.xvfb-run-wrapped << 'HERE'

--- xvfb-run 2019-02-28 06:18:21.000000000 +0000
+++ xvfb-run 2019-03-04 12:37:31.129377336 +0000
@@ -178,7 +178,7 @@

# Start the command and save its exit status.
set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
RETVAL=$?
set -e
HERE
'';
});
node = pkgs.nodejs-14_x;
node = pkgs.nodejs_20;
yarn = pkgs.yarn.override { nodejs = node; };
in
pkgs.mkShell {
Expand All @@ -32,7 +13,7 @@ pkgs.mkShell {
pkgs.curl
node
yarn
xvfb-run-stderr
pkgs.xvfb-run
];
shellHook = ''
echo "settup env"
Expand Down