From 808afae62be06def525eea80a97bcf106b39abbe Mon Sep 17 00:00:00 2001 From: Brendan Hansknecht Date: Mon, 15 Feb 2021 23:55:50 -0800 Subject: [PATCH] get nix-shell --pure to work. --- examples/.gitignore | 1 + shell.nix | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/examples/.gitignore b/examples/.gitignore index 509ab35b68..51113c1046 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -8,4 +8,5 @@ benchmarks/nqueens benchmarks/deriv benchmarks/cfold benchmarks/rbtree-insert +benchmarks/rbtree-del effect-example diff --git a/shell.nix b/shell.nix index 14376baf6e..2f6a4bf265 100644 --- a/shell.nix +++ b/shell.nix @@ -48,6 +48,7 @@ let xorg.libXcursor xorg.libXrandr xorg.libXi + xorg.libxcb ] else [ ]; @@ -74,13 +75,14 @@ let llvmPkgs.clang pkg-config zig - # llb deps - libffi - libxml2 - zlib + # lib deps llvmPkgs.libcxx llvmPkgs.libcxxabi + libffi libunwind + libxml2 + ncurses + zlib # faster builds - see https://github.com/rtfeldman/roc/blob/trunk/BUILDING_FROM_SOURCE.md#use-lld-for-the-linker llvmPkgs.lld # dev tools @@ -94,9 +96,17 @@ in mkShell (nixos-env // { # Additional Env vars LLVM_SYS_100_PREFIX = "${llvmPkgs.llvm}"; - APPEND_LIBRARY_PATH = stdenv.lib.makeLibraryPath - ([ pkg-config llvmPkgs.libcxx llvmPkgs.libcxxabi libunwind ] ++ linux-inputs); - LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:$APPEND_LIBRARY_PATH"; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath + ([ + pkg-config + stdenv.cc.cc.lib + llvmPkgs.libcxx + llvmPkgs.libcxxabi + libunwind + libffi + ncurses + zlib + ] ++ linux-inputs); # Aliases don't work cross shell, so we do this shellHook = ''