diff options
| author | Peter Simons <simons@cryp.to> | 2014-06-18 10:00:00 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-06-18 10:00:00 +0200 |
| commit | f7c72829648675f7d5bb6d3220d0fe0bb3091ac7 (patch) | |
| tree | 7d4d9282539724686f3e6d11bb1fc8273235d7d4 | |
| parent | 8297a26746247e17a29123b826e0de1af318d6fd (diff) | |
| parent | ff995adb0d9a253bdd20f04e5c7805263f2d2b4f (diff) | |
| download | nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar.gz nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar.bz2 nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar.lz nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar.xz nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.tar.zst nixlib-f7c72829648675f7d5bb6d3220d0fe0bb3091ac7.zip | |
Merge pull request #2979 from bluescreen303/idris
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/idris/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/idris/wrapper.nix | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 8671a926f677..614a37030510 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -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 ]; diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix index 427a690234ca..fce5c0c89f37 100644 --- a/pkgs/development/compilers/idris/wrapper.nix +++ b/pkgs/development/compilers/idris/wrapper.nix @@ -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 '' |