arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

nix: stdenv.lib -> lib

Browse Source 
[skip_ci]
This commit is contained in:
Pavol Rusnak 2021-01-19 17:01:47 +01:00
parent f3a64435f1
commit 1f5d8b89d7
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/shell.nix
View File

@ -22,7 +22,7 @@ let
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "trezor-firmware-env"; name = "trezor-firmware-env";
buildInputs = stdenv.lib.optionals fullDeps [ buildInputs = lib.optionals fullDeps [
# install other python versions for tox testing # install other python versions for tox testing
# NOTE: running e.g. "python3" in the shell runs the first version in the following list, # NOTE: running e.g. "python3" in the shell runs the first version in the following list,
# and poetry uses the default version (currently 3.8) # and poetry uses the default version (currently 3.8)
@ -53,10 +53,10 @@ stdenv.mkDerivation ({
protobuf3_6 protobuf3_6
wget wget
zlib zlib
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ] ++ lib.optionals (!stdenv.isDarwin) [
procps procps
valgrind valgrind
] ++ stdenv.lib.optionals (stdenv.isDarwin) [ ] ++ lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreAudio
darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioToolbox
darwin.apple_sdk.frameworks.ForceFeedback darwin.apple_sdk.frameworks.ForceFeedback
@ -75,6 +75,6 @@ stdenv.mkDerivation ({
# Fix bdist-wheel problem by setting source date epoch to a more recent date # Fix bdist-wheel problem by setting source date epoch to a more recent date
SOURCE_DATE_EPOCH = 1600000000; SOURCE_DATE_EPOCH = 1600000000;
} // (stdenv.lib.optionalAttrs fullDeps) { } // (lib.optionalAttrs fullDeps) {
TREZOR_MONERO_TESTS_PATH = moneroTestsPatched; TREZOR_MONERO_TESTS_PATH = moneroTestsPatched;
}) })