diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wxwidgets')
4 files changed, 22 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix index 98cf0d58479..deb7d19c0de 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, libX11, cairo +, libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a519..5db7cfc26ba 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, setfile +, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -32,8 +32,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + [ gtk2 libXinerama libSM libXxf86vm xorgproto ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--enable-gtk2" "--disable-precomp-headers" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" diff --git a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index 8de7f99fe5f..df90342a972 100644 --- a/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,9 @@ { 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 ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true @@ -28,9 +29,10 @@ stdenv.mkDerivation rec { sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - 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 ]; 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 ]; |