diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix index 99f86974cdb..44e6fe49b48 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig -, gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xorgproto, gstreamer, gst-plugins-base, GConf, setfile +, libXinerama, libSM, libXxf86vm +, gtk2, gtk3 +, xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true @@ -17,19 +18,20 @@ assert withWebKit -> webkitgtk != null; assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { - version = "3.1.2"; + version = "3.1.3"; pname = "wxwidgets"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb"; + sha256 = "022mby78q7n0bhd4mph04hz93c9qamnvzv3h1s26r839k28760f4"; }; - buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + buildInputs = [ + libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 ] + ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; |