From bd41ec0b293b6457c6a338ccd02565d4698e87fb Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 3 Sep 2019 20:53:58 +0200 Subject: [PATCH] shell.nix: adding darwin frameworks removing pytest-random-order until it hits upstrean --- shell.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index 7658088057..7119c3f7f7 100644 --- a/shell.nix +++ b/shell.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { check clang-tools gcc - gcc-arm-embedded gnumake graphviz libusb1 @@ -20,6 +19,20 @@ stdenv.mkDerivation { scons valgrind zlib + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + gcc-arm-embedded + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.CoreAudio + darwin.apple_sdk.frameworks.AudioToolbox + darwin.apple_sdk.frameworks.ForceFeedback + darwin.apple_sdk.frameworks.CoreVideo + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.QuartzCore + darwin.apple_sdk.frameworks.Metal + darwin.libobjc + libiconv ]; LD_LIBRARY_PATH="${libusb1}/lib"; shellHook = ''