diff options
| author | Shea Levy <shea@shealevy.com> | 2011-04-06 16:20:07 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-04-06 16:20:07 +0000 |
| commit | 448be29a212a4979d7033ff10fc9a64e9dc077ce (patch) | |
| tree | 41cbdaff0e3410446504f41d4c6bc40b00c57818 | |
| parent | 28ad00775f79a9073dc354924dc4b06b6bdf0a4f (diff) | |
Merge in some changes from trunk. backups/stdenv-ada@26758
gcc46 is still not built with callPackage, as this causes problems during the bootstrap svn path=/nixpkgs/branches/stdenv-ada/; revision=26725
| -rw-r--r-- | pkgs/development/compilers/gcc-4.6/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index da4d43b414020..04617dff4813a 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -131,7 +131,7 @@ in 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 @@ stdenv.mkDerivation ({ 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]) |