qt48: fix build on darwin

* build with clang
This commit is contained in:
Jason \"Don\" O'Conal 2013-07-04 15:05:41 +10:00 committed by Rok Garbas
parent 3d6f857f99
commit 6fc89eead6
2 changed files with 9 additions and 4 deletions

View File

@ -147,10 +147,10 @@ stdenv.mkDerivation rec {
};
meta = {
homepage = http://qt-project.org/;
homepage = http://qt-project.org/;
description = "A cross-platform application framework for C++";
license = "GPL/LGPL";
maintainers = with maintainers; [ urkud sander phreedom ];
platforms = platforms.all;
license = "GPL/LGPL";
maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
platforms = platforms.all;
};
}

View File

@ -5222,6 +5222,11 @@ let
# GNOME dependencies are not used unless gtkStyle == true
inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
cups = if stdenv.isLinux then cups else null;
# resolve unrecognised flag '-fconstant-cfstrings' errors
stdenv = if stdenv.isDarwin
then clangStdenv
else stdenv;
};
qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {