diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 21:05:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 21:23:28 +0200 |
| commit | 2df33973755059a14e819d1ef4f4635c2cd7c238 (patch) | |
| tree | 190e8960029e0347ede660ea29e389f4af2ef41b /pkgs/development/libraries/qt-4.x | |
| parent | 47caef475f8102f165356130fb36e87a11b43171 (diff) | |
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.
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 |
1 files changed, 0 insertions, 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 71e8375ee00ba..b5a10e8f11a75 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; |