From e3eb124873559ca1066be40146d3134bd084e585 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 27 Mar 2009 09:39:11 +0000 Subject: [PATCH] fix build of opera on x86_64 svn path=/nixpkgs/trunk/; revision=14733 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed60aa0f2b..2744b68fc47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8525,9 +8525,9 @@ let inherit fetchurl zlib glibc stdenv; # stdenv = overrideGCC stdenv gcc40; inherit (xlibs) libX11 libSM libICE libXt libXext; - qt = qt3gcc33; #33motif = lesstif; - libstdcpp5 = gcc33.gcc; + qt = if (stdenv.system == "i686-linux") then qt3gcc33 else qt3; + libstdcpp5 = (if (stdenv.system == "i686-linux") then gcc33 /* stdc++ 3.8 is used */ else gcc42).gcc; }; pan = import ../applications/networking/newsreaders/pan {