diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-15 11:34:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 11:34:57 -0400 |
| commit | 3532a6452eab504e2f71c847c5b00cfd7ea2bc65 (patch) | |
| tree | b68423ad9f90e98f046859fe6cc9e2e5479adfdf /pkgs/development/libraries/qt-4.x/4.8/default.nix | |
| parent | ae15177adec5c01cb707ecd0d3f998e8fa556404 (diff) | |
| parent | 280795c163ba70d6d0c0c0fc2e87ce4c8801dbac (diff) | |
Merge pull request #66683 from obsidiansystems/missing-qt-patch
qt4: Vendor bitrotted Arch Linux patch
Diffstat (limited to 'pkgs/development/libraries/qt-4.x/4.8/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 12 |
1 files changed, 7 insertions, 5 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 de6457db98b22..f833d130fbba1 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) + # Patch is no longer available from here, so vendoring it for now. + #(fetchpatch { + # name = "qt4-gcc6.patch"; + # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + #}) + ./qt4-gcc6.patch ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; |