diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a5197..5db7cfc26ba9 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc051bf193da..31848f8ceb8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15566,7 +15566,6 @@ in wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; };