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

rename <gcc-frontend>.gcc to <gcc-frontend>.cc

Browse Source
This commit is contained in:
Eric Seidel 2015-01-14 20:59:10 -08:00
parent b070eacfcd
commit f272730399
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/freecad/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# This should work on both x86_64, and i686 linux # This should work on both x86_64, and i686 linux
preBuild = '' 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 = '' postInstall = ''

4
pkgs/applications/inferno/default.nix
View File

@ -46,10 +46,10 @@ stdenv.mkDerivation rec {
mk install mk install
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \ 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" --suffix PATH ':' "$out/share/inferno/Linux/386/bin"
makeWrapper $infernoWrapper $out/bin/inferno \ 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" \ --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
--set INFERNO_ROOT "$out/share/inferno" --set INFERNO_ROOT "$out/share/inferno"
''; '';

2
pkgs/applications/science/math/R/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
CXX=$(type -p g++) CXX=$(type -p g++)
FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
JAVA_HOME="${jdk}" JAVA_HOME="${jdk}"
LDFLAGS="-L${gfortran.gcc}/lib" LDFLAGS="-L${gfortran.cc}/lib"
RANLIB=$(type -p ranlib) RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}" R_SHELL="${stdenv.shell}"
) )

2
pkgs/tools/typesetting/pdftk/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
sed -e 's@/usr/bin/@@g' -i Makefile.* sed -e 's@/usr/bin/@@g' -i Makefile.*
NIX_ENFORCE_PURITY= \ NIX_ENFORCE_PURITY= \
make \ 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 \ GCJ=gcj GCJH=gcjh GJAR=gjar \
-iC ../java all -iC ../java all
''; '';