public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14705 from acowley/qt4-darwin

Browse Source 
qt4.8: darwin compatibility
This commit is contained in:
vbgl 2016-04-20 11:25:55 +02:00
commit df681cda9a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -11,6 +11,8 @@
, docs ? false , docs ? false
, examples ? false , examples ? false
, demos ? false , demos ? false
# darwin support
, cf-private, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
}: }:
with stdenv.lib; with stdenv.lib;
@ -114,7 +116,7 @@ stdenv.mkDerivation rec {
-no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend
${if developerBuild then "-developer-build" else ""} ${if developerBuild then "-developer-build" else ""}
''; '' + optionalString stdenv.isDarwin "-platform unsupported/macx-clang-libc++";
propagatedBuildInputs = propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
@ -129,14 +131,16 @@ stdenv.mkDerivation rec {
[ cups # Qt dlopen's libcups instead of linking to it [ cups # Qt dlopen's libcups instead of linking to it
postgresql sqlite libjpeg libmng libtiff icu ] postgresql sqlite libjpeg libmng libtiff icu ]
++ optionals (mysql != null) [ mysql.lib ] ++ optionals (mysql != null) [ mysql.lib ]
++ optionals gtkStyle [ gtk gdk_pixbuf ]; ++ optionals gtkStyle [ gtk gdk_pixbuf ]
++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
nativeBuildInputs = [ perl pkgconfig which ]; nativeBuildInputs = [ perl pkgconfig which ];
enableParallelBuilding = false; enableParallelBuilding = false;
NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
"-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+ optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
"-lglib-2.0"; "-lglib-2.0";
@ -145,6 +149,8 @@ stdenv.mkDerivation rec {
# resolve "extra qualification on member" error # resolve "extra qualification on member" error
sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \ sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \
src/gui/kernel/qt_cocoa_helpers_mac_p.h src/gui/kernel/qt_cocoa_helpers_mac_p.h
find . -name "Makefile*" | xargs sed -i 's/^\(LINK[[:space:]]* = clang++\)/\1 ${NIX_LDFLAGS}/'
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
''; '';
crossAttrs = let crossAttrs = let

3
pkgs/top-level/all-packages.nix
View File

@ -8537,6 +8537,9 @@ in
# XXX: mariadb doesn't built on fbsd as of nov 2015 # XXX: mariadb doesn't built on fbsd as of nov 2015
mysql = if (!stdenv.isFreeBSD) then mysql else null; mysql = if (!stdenv.isFreeBSD) then mysql else null;
inherit (pkgs.darwin) cf-private libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
}; };
qt48Full = appendToName "full" (qt48.override { qt48Full = appendToName "full" (qt48.override {