diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:59:10 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:59:10 -0800 |
| commit | f27273039986dc634333b125aa975d3a7f812a3d (patch) | |
| tree | dd2608a773d0c4b386c4cdc0de1baef4ae22ac91 /pkgs | |
| parent | b070eacfcdc6be36b2d4aca7c8764cba34e7af58 (diff) | |
| download | nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar.gz nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar.bz2 nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar.lz nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar.xz nixlib-f27273039986dc634333b125aa975d3a7f812a3d.tar.zst nixlib-f27273039986dc634333b125aa975d3a7f812a3d.zip | |
rename <gcc-frontend>.gcc to <gcc-frontend>.cc
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/inferno/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/pdftk/default.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index a7665177046b..57dd49f7eb7c 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # This should work on both x86_64, and i686 linux preBuild = '' - export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS"; + export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; postInstall = '' diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index c5a40fcbf5b3..0d61d5635a51 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { mk install mkdir -p $out/bin makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \ - --suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \ + --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \ --suffix PATH ':' "$out/share/inferno/Linux/386/bin" makeWrapper $infernoWrapper $out/bin/inferno \ - --suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \ + --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \ --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \ --set INFERNO_ROOT "$out/share/inferno" ''; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 8413eb14a35c..05f18334b991 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { CXX=$(type -p g++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" - LDFLAGS="-L${gfortran.gcc}/lib" + LDFLAGS="-L${gfortran.cc}/lib" RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" ) diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index a2ef7716cda2..84a853bb0df6 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sed -e 's@/usr/bin/@@g' -i Makefile.* NIX_ENFORCE_PURITY= \ make \ - LIBGCJ="${gcj.gcc}/share/java/libgcj-${gcj.gcc.version}.jar" \ + LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \ GCJ=gcj GCJH=gcjh GJAR=gjar \ -iC ../java all ''; |