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

wxGTK28: drop ancient deps

Browse Source 
The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days.

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

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

@ -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 ];

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

@ -15563,9 +15563,7 @@ in
wxGTK30 = wxGTK30-gtk2;
wxGTK31 = wxGTK31-gtk2;
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
inherit (gnome2) GConf;
};
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf;
@ -24400,7 +24398,6 @@ in
fsg = callPackage ../games/fsg {
wxGTK = wxGTK28.override {
unicode = false;
gst-plugins-base = null;
};
};