|
|
|
@ -277,6 +277,7 @@ stdenv.mkDerivation ({ |
|
|
|
|
inherit noSysDirs staticCompiler langJava |
|
|
|
|
libcCross crossMingw; |
|
|
|
|
|
|
|
|
|
depsBuildBuild = [ buildPackages.stdenv.cc ]; |
|
|
|
|
nativeBuildInputs = [ texinfo which gettext ] |
|
|
|
|
++ (optional (perl != null) perl) |
|
|
|
|
++ (optional javaAwtGtk pkgconfig); |
|
|
|
@ -287,7 +288,6 @@ stdenv.mkDerivation ({ |
|
|
|
|
++ (optionals langJava [ boehmgc zip unzip ]) |
|
|
|
|
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) |
|
|
|
|
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) |
|
|
|
|
++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc]) |
|
|
|
|
++ (optionals langAda [gnatboot]) |
|
|
|
|
++ (optionals langVhdl [gnat]) |
|
|
|
|
|
|
|
|
|