Author: viric Date: 2010-06-12 21:52:50 +0000 (Sat, 12 Jun 2010) New Revision: 22238
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22238&view=rev Added: nixpkgs/trunk/pkgs/development/compilers/llvm/dragonegg.nix Removed: nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: Moving dragonegg (gcc shared object plugin) into the llvm directory, as I think it fits better there than in 'libraries'. Changes: Copied: nixpkgs/trunk/pkgs/development/compilers/llvm/dragonegg.nix (from rev 22237, nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix) =================================================================== --- nixpkgs/trunk/pkgs/development/compilers/llvm/dragonegg.nix (rev 0) +++ nixpkgs/trunk/pkgs/development/compilers/llvm/dragonegg.nix 2010-06-12 21:52:50 UTC (rev 22238) @@ -0,0 +1,29 @@ +{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}: + +stdenv.mkDerivation rec { + name = "dragonegg-2.7"; + + 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; + }; +} Deleted: nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix 2010-06-12 21:52:45 UTC (rev 22237) +++ nixpkgs/trunk/pkgs/development/libraries/dragonegg/default.nix 2010-06-12 21:52:50 UTC (rev 22238) @@ -1,29 +0,0 @@ -{stdenv, fetchsvn, llvm, gmp, mpfr, mpc}: - -stdenv.mkDerivation rec { - name = "dragonegg-2.7"; - - 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; - }; -} Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-12 21:52:45 UTC (rev 22237) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-06-12 21:52:50 UTC (rev 22238) @@ -3708,7 +3708,7 @@ libXrender; }; - dragonegg = import ../development/libraries/dragonegg { + dragonegg = import ../development/compilers/llvm/dragonegg.nix { inherit fetchsvn llvm gmp mpfr mpc; stdenv = overrideGCC stdenv gcc45; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
