Merge master into staging-next

2019-06-25 16:26:29 +02:00
parent 145a620802 32a7e35d17
commit 4589a04299
14 changed files with 122 additions and 30 deletions
--- a/pkgs/development/libraries/wxwidgets/3.1/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
  ";

  passthru = {
-    inherit compat24 compat26 unicode;
+    inherit compat28 compat30 unicode;
    gtk = if withGtk2 then gtk2 else gtk3;
  };