Author: shlevy
Date: Wed Apr 6 16:20:07 2011
New Revision: 26725
URL: https://svn.nixos.org/websvn/nix/?rev=26725&sc=1
Log:
Merge in some changes from trunk.
gcc46 is still not built with callPackage, as this causes problems during
the bootstrap
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Wed Apr 6 15:53:03 2011 (r26724)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Wed Apr 6 16:20:07 2011 (r26725)
@@ -131,7 +131,7 @@
assert gtk != null -> (filter (x: x == null) xlibs) == [];
stdenv.mkDerivation ({
- name = "${name}-${version}" + crossNameAddon;
+ name = "${name}${if stripped then "" else "-debug"}-${version}" +
crossNameAddon;
builder = ./builder.sh;
@@ -202,16 +202,15 @@
libcCross crossMingw;
buildNativeInputs = [ texinfo which ]
- ++ optional (perl != null) perl;
-
+ ++ optional langJava perl;
+
buildInputs = [ gmp mpfr mpc libelf gettext ]
++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl)
++ (optional (cloog != null) cloog)
++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib)
- ++ (optional (boehmgc != null) boehmgc)
- ++ (optionals langJava [zip unzip])
+ ++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
++ (optionals (cross != null) [binutilsCross])
++ (optionals (gnatboot != null) [gnatboot])
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
