From 6fc89eead6ff281ef8d482c08ef4e61fd16ea32d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:05:41 +1000 Subject: [PATCH] qt48: fix build on darwin * build with clang --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index b797f631b8e..29116d0eb11 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bd4252a8fb..73cfc6f005e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {