public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxGTK30-gtk2: drop ancient deps

Browse Source 
GConf has been abandoned for many years and would not work without user running the daemon.
This commit is contained in:
Jan Tojnar 2020-08-23 22:43:48 +02:00
parent 6de7492703
commit e2d02a84d6
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig { stdenv, fetchFromGitHub, fetchurl, pkgconfig
, libXinerama, libSM, libXxf86vm , libXinerama, libSM, libXxf86vm
, gtk2, GConf ? null, gtk3 , gtk2, gtk3
, xorgproto, gst_all_1, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 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 (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optional withWebKit webkitgtk ++ optional withWebKit webkitgtk

1
pkgs/top-level/all-packages.nix
View File

@ -15572,7 +15572,6 @@ in
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
withGtk2 = true; withGtk2 = true;
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
}; };