diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
| commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
| tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/applications/networking/browsers/opera | |
| parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.
Diffstat (limited to 'pkgs/applications/networking/browsers/opera')
| -rw-r--r-- | pkgs/applications/networking/browsers/opera/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d0fe7e91989d5..eefae9d5dae89 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; +assert stdenv.isLinux && stdenv.cc.gcc != null && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE + [ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { elif [ $type == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ "$f" elif [ $type == "DYN" ]; then |