From 0c734dc8fd072152f0f7c66d9ad9a9db1bde4d0f Mon Sep 17 00:00:00 2001 From: Tomas Susanka Date: Thu, 2 Jul 2020 13:01:50 +0000 Subject: [PATCH] ci: remove shell hook Fixes darwin job. --- ci/build.yml | 2 +- shell.nix | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index 686d762a9..79af59763 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -114,7 +114,7 @@ core unix frozen regular darwin: when: manual script: - . $HOME/.nix-profile/etc/profile.d/nix.sh - - nix-shell --run "cd core && make build_unix_frozen" + - nix-shell --run "pipenv sync && cd core && pipenv run make build_unix_frozen" - mkdir -p TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/{MacOS,libs} - cp -v core/build/unix/micropython TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/MacOS/TrezorEmu-$CI_COMMIT_SHORT_SHA - dylibbundler -of -b -i /usr/lib/system -d TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/libs -x TrezorEmu-$CI_COMMIT_SHORT_SHA.app/Contents/MacOS/TrezorEmu-$CI_COMMIT_SHORT_SHA diff --git a/shell.nix b/shell.nix index 3a62563ba..701029a21 100644 --- a/shell.nix +++ b/shell.nix @@ -38,8 +38,4 @@ stdenv.mkDerivation { ]; LD_LIBRARY_PATH = "${libffi}/lib:${libjpeg.out}/lib:${libusb1}/lib:${libressl.out}/lib"; NIX_ENFORCE_PURITY = 0; - shellHook = '' - pipenv shell - exit - ''; }