From cba717fd7b07166e97a2ee551a29648e3b07cd5c Mon Sep 17 00:00:00 2001
From: Tino Breddin <tino@daogames.com>
Date: Sat, 27 Sep 2014 21:58:58 +0200
Subject: elixir: make curl available to mix

---
 pkgs/development/interpreters/elixir/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 8f0b4a238b3..a6fc139e2e5 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
+{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
 
 let
   version = "1.0.0";
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
 
     substituteInPlace Makefile \
       --replace "/usr/local" $out
+    substituteInPlace bin//mix \
+      --replace "/usr/bin/env elixir" "$out/bin/elixir"
   '';
 
   postFixup = ''
@@ -29,7 +31,8 @@ stdenv.mkDerivation {
     for f in $out/bin/*
     do
       wrapProgram $f \
-      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin"
+      --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
+      --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt"
     done
   '';
 
-- 
cgit 1.4.1


From 4ef1099310484e15cf90ec7e74eaa45fec933cdf Mon Sep 17 00:00:00 2001
From: Tino Breddin <tino@daogames.com>
Date: Wed, 1 Oct 2014 20:27:55 +0200
Subject: fix double slash in mix binary path

---
 pkgs/development/interpreters/elixir/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development/interpreters')

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index a6fc139e2e5..9a5d2417df7 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
     substituteInPlace Makefile \
       --replace "/usr/local" $out
-    substituteInPlace bin//mix \
+    substituteInPlace bin/mix \
       --replace "/usr/bin/env elixir" "$out/bin/elixir"
   '';
 
-- 
cgit 1.4.1