Unverified Commit 2fd206f7 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

wxGTK31-gtk2: drop ancient deps 

GConf has been abandoned for many years and would not work without user running the daemon.
parent e2d02a84

pkgs/development/libraries/wxwidgets/3.1/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig

, libXinerama, libSM, libXxf86vm

, gtk2, GConf ? null, gtk3

, gtk2, gtk3

, xorgproto, gst_all_1, setfile

, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms

, withMesa ? libGLSupported, libGLU ? null, libGL ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base

  ] ++ optionals withGtk2 [ gtk2 GConf ]

  ] ++ optionals withGtk2 [ gtk2 ]

    ++ optional (!withGtk2) gtk3

    ++ optional withMesa libGLU

    ++ optional withWebKit webkitgtk

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -15584,7 +15584,6 @@ in 














  wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {















    withGtk2 = true;













    inherit (gnome2) GConf;















    inherit (darwin.stubs) setfile;















    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;















  };