diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-04 18:27:32 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-04 18:28:33 +0100 |
| commit | 8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a (patch) | |
| tree | 796e3cf87325dd67ea427c744e77f31821e592cf /pkgs/development/libraries/wxwidgets | |
| parent | 8923737cd5d386c3eafdf8f84fa1aad1a77a4368 (diff) | |
| download | nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar.gz nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar.bz2 nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar.lz nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar.xz nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.tar.zst nixlib-8ea1b79003ddf21a0a7d8da4812aeba9d7f99e9a.zip | |
wxGTK-{2.9,3.0}: apply an upstream patch
Close #30909.
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/2.9/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 56080841ca3d..6230536b33ab 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -20,6 +20,14 @@ stdenv.mkDerivation { sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; }; + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) + ]; + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 2375de4b1bfa..951f27f7d547 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig +, gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -37,9 +38,14 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = + patches = [ + (fetchurl { # https://trac.wxwidgets.org/ticket/17942 + url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" + + "fix_assertion_using_hide_in_destroy.diff"; + sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; + }) # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - optional (!withGtk2) (fetchpatch { + ] ++ optional (!withGtk2) (fetchpatch { url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; }); |