From b9281bd18119771a17b8067b1a9fd1693373aabb Mon Sep 17 00:00:00 2001 From: Ju Liu Date: Mon, 30 Aug 2021 22:45:40 +0100 Subject: [PATCH] Only install glibc_multi on Linux Mac OS does not support it --- shell.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 8ac9510a0d..ded539527d 100644 --- a/shell.nix +++ b/shell.nix @@ -17,6 +17,7 @@ let linuxInputs = with pkgs; lib.optionals stdenv.isLinux [ + glibc_multi valgrind vulkan-headers vulkan-loader @@ -49,7 +50,6 @@ let zig # lib deps - glibc_multi llvmPkgs.libcxx llvmPkgs.libcxxabi libffi @@ -73,7 +73,8 @@ in pkgs.mkShell { # Additional Env vars LLVM_SYS_120_PREFIX = "${llvmPkgs.llvm.dev}"; - NIXOS_GLIBC_PATH = "${pkgs.glibc_multi.out}/lib"; + NIXOS_GLIBC_PATH = + if pkgs.stdenv.isLinux then "${pkgs.glibc_multi.out}/lib" else ""; LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath ([ pkg-config