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

qt4: add patch to fix build with gcc6, set c++ std

This commit is contained in:
Robin Gloster 2017-01-18 00:22:08 +01:00
parent a3a0e8fe64
commit 9aae2991f2
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 12 additions and 4 deletions
pkgs/development/libraries/qt-4.x/4.8
default.nix

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

@ -80,12 +80,19 @@ stdenv.mkDerivation rec {
gtk = gtk2.out; gtk = gtk2.out;
gdk_pixbuf = gdk_pixbuf.out; gdk_pixbuf = gdk_pixbuf.out;
}) })
++ [(fetchpatch { ++ [
(fetchpatch {
name = "fix-medium-font.patch"; name = "fix-medium-font.patch";
url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/"
+ "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4";
sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
})]; })
(fetchpatch {
name = "qt4-gcc6.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
})
];
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
@ -145,8 +152,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false; enableParallelBuilding = false;
NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) NIX_CFLAGS_COMPILE = "-std=gnu++98"
"-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include" + optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
"-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"
+ optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1"; + optionalString stdenv.isDarwin " -I${libcxx}/include/c++/v1";
NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin) NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)