Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c089080fc066
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e52455baffe3
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on May 27, 2017

  1. wxGTK30: 3.0.2 -> 3.0.3.1

    Volth committed May 27, 2017
    Copy the full SHA
    a195c04 View commit details

Commits on May 28, 2017

  1. no need to patch if old wxWebView is used

    Volth committed May 28, 2017
    Copy the full SHA
    bb8759f View commit details

Commits on Jul 1, 2017

  1. Merge branch 'master' into wxwidgets-3.0.3.1

    volth authored Jul 1, 2017
    Copy the full SHA
    a720bd4 View commit details

Commits on Jul 5, 2017

  1. Merge pull request #26154 from volth/wxwidgets-3.0.3.1 

    wxGTK30: 3.0.2 -> 3.0.3.1
    @7c6f434c
    7c6f434c authored Jul 5, 2017
    Copy the full SHA
    e52455b View commit details
Showing with 20 additions and 15 deletions.
  1. +20 −15 pkgs/development/libraries/wxwidgets/3.0/default.nix
35 changes: 20 additions & 15 deletions pkgs/development/libraries/wxwidgets/3.0/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
{ stdenv, fetchFromGitHub, 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
, withWebKit ? false, webkitgtk24x-gtk2 ? null
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:


assert withMesa -> mesa_glu != null && mesa_noglu != null;
assert withWebKit -> webkitgtk24x-gtk2 != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;

with stdenv.lib;

let
version = "3.0.2";
version = "3.0.3.1";
in
stdenv.mkDerivation {
name = "wxwidgets-${version}";

src = fetchurl {
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq";
};

buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa mesa_glu
++ optional withWebKit webkitgtk24x-gtk2
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];

nativeBuildInputs = [ pkgconfig ];

propagatedBuildInputs = optional stdenv.isDarwin AGL;

patches = [ (fetchpatch {
url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch";
sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h";
}) ];
patches =
# "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4
optional (!withGtk2) (fetchpatch {
url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch";
sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q";
});

configureFlags =
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
[ "--disable-precomp-headers" "--enable-mediactrl"
(if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26") ]
++ optional unicode "--enable-unicode"
@@ -72,7 +77,7 @@ stdenv.mkDerivation {

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

enableParallelBuilding = true;