Merge remote-tracking branch 'upstream/master' into staging

pkgs/development/interpreters/elixir/default.nix

@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash,
+  debugInfo ? false }:
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
@@ -16,6 +17,12 @@ stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
   LC_TYPE = "en_US.UTF-8";
 
+  setupHook = ./setup-hook.sh;
+
+  buildFlags = if debugInfo
+   then "ERL_COMPILER_OPTIONS=debug_info"
+   else "";
+
   preBuild = ''
     # The build process uses ./rebar. Link it to the nixpkgs rebar
     rm -v rebar

pkgs/development/interpreters/elixir/setup-hook.sh

@@ -0,0 +1,5 @@
+addErlLibPath() {
+    addToSearchPath ERL_LIBS $1/lib/elixir/lib
+}
+
+envHooks+=(addErlLibPath)