diff options
| author | Volth <volth@webmaster.ms> | 2017-05-28 10:09:14 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-05-28 10:09:47 +0000 |
| commit | bb8759f9286856292e52f02735f45994f6be90bf (patch) | |
| tree | 35a6c7a41f44865d6cc2e389af1b86c64aab4ded /pkgs/development/libraries/wxwidgets | |
| parent | a195c0418ff67a0a5b82f52ab2753807616b72fe (diff) | |
| download | nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar.gz nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar.bz2 nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar.lz nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar.xz nixlib-bb8759f9286856292e52f02735f45994f6be90bf.tar.zst nixlib-bb8759f9286856292e52f02735f45994f6be90bf.zip | |
no need to patch if old wxWebView is used
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index a84069e62b91..0de8d2701825 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -37,13 +37,12 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = [ + patches = # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 - (fetchpatch { + optional (!withGtk2) (fetchpatch { url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; - }) - ]; + }); configureFlags = [ "--disable-precomp-headers" "--enable-mediactrl" |