From f6066873d3b65e507b1efb065db6a33357d4e812 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Thu, 9 Jun 2016 15:17:34 -0700 Subject: [PATCH] Ocaml files, nix development files --- dotfiles/ocamlinit | 1 + nix/development/default.nix | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dotfiles/ocamlinit b/dotfiles/ocamlinit index 34844c1..0c2a922 100644 --- a/dotfiles/ocamlinit +++ b/dotfiles/ocamlinit @@ -1,5 +1,6 @@ #use "topfind";; #thread;; #camlp4o;; +#require "async";; #require "core.top";; #require "core.syntax";; diff --git a/nix/development/default.nix b/nix/development/default.nix index 8c9ddc3..405136c 100644 --- a/nix/development/default.nix +++ b/nix/development/default.nix @@ -1,8 +1,13 @@ { config, pkgs, ... }: { environment = { + + # OCaml has trouble finding pthread. So we set PTHREAD_LIBS to give iet a heads up + # ** currently doesnt set PTHREAD_LIBS at all ** variables = { EDITOR = "nvim"; + PTHREAD_CFLAGS = "-I${pkgs.glibc}/include/"; + PTHREAD_LIBS = "-L${pkgs.glibc}/lib/"; }; systemPackages = with pkgs; [ @@ -14,6 +19,7 @@ freetype # Library to render fonts required by some packages gcc # GNU Compiler Collection ghc # Haskell compiler + glibc # Glibc gnumake # GNU Make git # Source control libev # Event loop library @@ -24,10 +30,12 @@ ocamlPackages.ocaml_batteries # OCaml batteries included ocamlPackages.merlin # OCaml editor enhancement ocamlPackages.findlib # OCaml findlib + ocamlPackages.lambdaTerm # Lambda Term Library ocamlPackages.ocaml_lwt # OCaml LWT Library - Saves time otherwise spent fighting with opam ocamlPackages.ocaml_oasis # OASIS Project Architecture Tool for OCaml ocamlPackages.utop # Much better top-level for OCaml opam # OCaml package manager + pkgconfig python3 # Python 3 python34Packages.setuptools # Python setuptools silver-searcher # Better than grep