colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2979 from bluescreen303/idris

Browse Source 
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
This commit is contained in:
Peter Simons 2014-06-18 10:00:00 +02:00
commit f7c7282964
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/editors/emacs-modes/idris/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchgit, emacs }:
{ stdenv, fetchurl, emacs }:
stdenv.mkDerivation rec {
name = "idris-mode-20140405";
name = "${pname}-${version}";
pname = "idris-mode";
version = "0.9.13.1";
src = fetchgit {
url = https://github.com/idris-hackers/idris-mode.git;
rev = "2e2d18fb757da4b42940ebe2a57d7a117175489f";
sha256 = "d4b52c6c43c038c94a7464cd9c849cd40c01696c440da8b057c00a9be22f9ac0";
src = fetchurl {
url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
sha256 = "0ymjbkwsq7qra691wyldw91xcdgrbx3468vvrha5jj92v7nwb8wx";
};
buildInputs = [ emacs ];

4
pkgs/development/compilers/idris/wrapper.nix
View File

@ -1,10 +1,10 @@
{ gmp, makeWrapper, gcc, runCommand, idris_plain}:
{ gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}:
runCommand "idris-wrapper" {} ''
source ${makeWrapper}/nix-support/setup-hook
mkdir -p $out/bin
ln -s ${idris_plain}/bin/idris $out/bin
wrapProgram $out/bin/idris \
--suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \
--suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
--suffix PATH : ${gcc}/bin
''