cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "qt4: fixup build with gcc8 by Arch aur patch"

Browse source 
The build was fixed in two ways, by both this patch and a substitution.
Let's keep the substitition instead of the patch as the patches may disappear.

This reverts commit ccc8c73ea0.
This commit is contained in:
Frederik Rietdijk 2019-09-08 21:05:40 +02:00
parent 47caef475f
commit 2df3397375
1 changed files with 0 additions and 6 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,12 +93,6 @@ stdenv.mkDerivation rec {
#}) #})
./qt4-gcc6.patch ./qt4-gcc6.patch
./qt4-openssl-1.1.patch ./qt4-openssl-1.1.patch
(fetchpatch {
name = "qt4-gcc8.diff";
url = "https://aur.archlinux.org/cgit/aur.git/plain/qt4-gcc8.patch?h=qt4&id=3ac369b8";
sha256 = "0zcdrlmanczr9cbrnc6f3nz6ldmj7rw5irlvndk89fl6fvj8zkwy";
extraPrefix = "./";
})
] ]
++ lib.optional gtkStyle (substituteAll ({ ++ lib.optional gtkStyle (substituteAll ({
src = ./dlopen-gtkstyle.diff; src = ./dlopen-gtkstyle.diff;