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

qt4: fix build with gcc9

Browse Source
This commit is contained in:
Franz Pletz 2019-11-04 14:08:49 +01:00
parent 6b10b78872
commit 688199745d
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,12 @@ stdenv.mkDerivation rec {
#}) #})
./qt4-gcc6.patch ./qt4-gcc6.patch
./qt4-openssl-1.1.patch ./qt4-openssl-1.1.patch
(fetchpatch {
name = "gcc9-foreach.patch";
url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/"
+ "0d4a3dd61ccb156dee556c214dbe91c04d44a717/debian/patches/gcc9-qforeach.patch";
sha256 = "0dzn6qxrgxb75rvck9kmy5gspawdn970wsjw56026dhkih8cp3pg";
})
] ]
++ lib.optional gtkStyle (substituteAll ({ ++ lib.optional gtkStyle (substituteAll ({
src = ./dlopen-gtkstyle.diff; src = ./dlopen-gtkstyle.diff;