diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:44:00 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:47:49 -0800 |
commit | 88eae464551f0efadccc8f64dd456679801b7939 (patch) | |
tree | a3e4b2f6e11eac41caeebbe770d13c5fa59f5327 /pkgs/applications | |
parent | f3c6827373be102caae5dcbadd31e73ed60fa17f (diff) | |
download | nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.gz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.bz2 nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.lz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.xz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.zst nixlib-88eae464551f0efadccc8f64dd456679801b7939.zip |
rename occurrences of gcc.gcc to gcc.cc
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/xca/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/copy-com/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/ike/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/mathematica/9.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/mathematica/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 0bc2170340c8..be99439c6178 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xca" \ - --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib" + --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" ''; buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix index 0b0fc359a6be..9ef8caafa98d 100644 --- a/pkgs/applications/networking/copy-com/default.nix +++ b/pkgs/applications/networking/copy-com/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ "$out/${appdir}/CopyConsole" - RPATH=${gcc.gcc}/lib:$out/${appdir} + RPATH=${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d55e2b18162b..d49162d07232 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ "$out/${appdir}/dropbox" - RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir} + RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 48f277ad4c98..56341b64d6ce 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" done ''; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 64ebfb34636d..c9357d7352f0 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { coreutils fontconfig freetype - gcc.gcc + gcc.cc gcc.libc glib ncurses diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 587321f09ec3..56e994258a6b 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { coreutils fontconfig freetype - gcc.gcc + gcc.cc gcc.libc glib ncurses |