From 2df33973755059a14e819d1ef4f4635c2cd7c238 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 8 Sep 2019 21:05:40 +0200 Subject: [PATCH] Revert "qt4: fixup build with gcc8 by Arch aur patch" 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 ccc8c73ea00321318e9ac2cb75879f57bef328a7. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 ------ 1 file changed, 6 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 71e8375ee00b..b5a10e8f11a7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -93,12 +93,6 @@ stdenv.mkDerivation rec { #}) ./qt4-gcc6.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 ({ src = ./dlopen-gtkstyle.diff;