diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index f01a7acf261..607a15c9da7 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gcc, flex, perl, libtool, groff }: +{stdenv, fetchurl, gcc, flex, perl, libtool, groff}: stdenv.mkDerivation { name = "llvm-2.7"; @@ -8,4 +8,11 @@ stdenv.mkDerivation { }; buildInputs = [ gcc flex perl libtool groff ]; + + meta = { + homepage = http://llvm.org/; + description = "Collection of modular and reusable compiler and toolchain technologies"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; } diff --git a/pkgs/development/libraries/dragonegg/default.nix b/pkgs/development/libraries/dragonegg/default.nix index 46dcf5e9001..810807cd1d1 100644 --- a/pkgs/development/libraries/dragonegg/default.nix +++ b/pkgs/development/libraries/dragonegg/default.nix @@ -1,15 +1,29 @@ -{stdenv, fetchsvn, llvm}: +{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "dragonegg-2.7"; - GCC = "gcc"; - - buildInputs = [ llvm ]; - src = fetchsvn { url = http://llvm.org/svn/llvm-project/dragonegg/branches/release_27; rev = 105882; sha256 = "0j0mj3zm1nd8kaj3b28b3w2dlzc1xbywq4mcdxk5nq4yds6rx5np"; }; + + # The gcc the plugin will be built for (the same used building dragonegg) + GCC = "gcc"; + + buildInputs = [ llvm gmp mpfr mpc ]; + + installPhase = '' + ensureDir $out/lib $out/share/doc/${name} + cp -d dragonegg.so $out/lib + cp README COPYING $out/share/doc/${name} + ''; + + meta = { + homepage = http://dragonegg.llvm.org/; + description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37d3e301db7..d1ec9761468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3710,7 +3710,7 @@ let }; dragonegg = import ../development/libraries/dragonegg { - inherit fetchsvn llvm; + inherit fetchsvn llvm gmp mpfr mpc; stdenv = overrideGCC stdenv gcc45; };