dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

wxGTK30: 3.0.3.1 -> 3.0.4 (#44045)

Browse Source
This commit is contained in:
volth 2018-07-29 20:01:45 +00:00 committed by xeji
parent c5f1717a19
commit 774e5294a2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -14,17 +14,15 @@ assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null
with stdenv.lib; with stdenv.lib;
let stdenv.mkDerivation rec {
version = "3.0.3.1"; version = "3.0.4";
in
stdenv.mkDerivation {
name = "wxwidgets-${version}"; name = "wxwidgets-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wxWidgets"; owner = "wxWidgets";
repo = "wxWidgets"; repo = "wxWidgets";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
}; };
buildInputs = buildInputs =
@ -44,11 +42,7 @@ stdenv.mkDerivation {
+ "fix_assertion_using_hide_in_destroy.diff"; + "fix_assertion_using_hide_in_destroy.diff";
sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
}) })
# "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 = configureFlags =
[ "--disable-precomp-headers" "--enable-mediactrl" [ "--disable-precomp-headers" "--enable-mediactrl"
@ -87,7 +81,7 @@ stdenv.mkDerivation {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
platforms = with platforms; darwin ++ linux; platforms = with platforms; darwin ++ linux;
license = licenses.wxWindows; license = licenses.wxWindows;