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

rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc

Browse Source
This commit is contained in:
Eric Seidel
2015-01-14 20:25:26 -08:00
parent 16fe4be790
commit f3c6827373
89 changed files with 137 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@@ -174,7 +174,7 @@ let result = stdenv.mkDerivation rec {
*/
libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.gcc] else []);
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []);
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";