public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Use depsBuildBuild for buildPackges.stdenv.cc

Browse Source
This commit is contained in:
John Ericson
2017-06-25 23:10:03 -04:00
parent 3a50395ef2
commit 5b74540c5b
11 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/5/default.nix
View File

@@ -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])