diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-08 18:24:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-08 18:24:29 +0200 |
| commit | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (patch) | |
| tree | 17bd762d87cb856abf4435b63b8899a6143d05ed /pkgs/development | |
| parent | 241a61939da4b21f58a474c2f302ae67164f62e6 (diff) | |
| download | nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar.gz nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar.bz2 nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar.lz nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar.xz nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.tar.zst nixlib-ccc8c73ea00321318e9ac2cb75879f57bef328a7.zip | |
qt4: fixup build with gcc8 by Arch aur patch
I'll hope that this simple removal of "volatile" is OK. I feel sure I saw a PR for this somewhere, but I can't find it.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 6 |
1 files changed, 6 insertions, 0 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 8c1c76db8f47..530b500f9d8b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -91,6 +91,12 @@ 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; |