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

wxGTK29: 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:43:21 +02:00
parent 55a7a01e80
commit 6de7492703
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { 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 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, withMesa ? 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 , libGLU ? null, libGL ? null
@ -32,8 +32,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer [ gtk2 libXinerama libSM libXxf86vm xorgproto ]
gst-plugins-base GConf ]
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
@ -42,7 +41,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = optional stdenv.isDarwin AGL; propagatedBuildInputs = optional stdenv.isDarwin AGL;
configureFlags = configureFlags =
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" [ "--enable-gtk2" "--disable-precomp-headers"
(if compat24 then "--enable-compat24" else "--disable-compat24") (if compat24 then "--enable-compat24" else "--disable-compat24")
(if compat26 then "--enable-compat26" else "--disable-compat26") ] (if compat26 then "--enable-compat26" else "--disable-compat26") ]
++ optional unicode "--enable-unicode" ++ optional unicode "--enable-unicode"

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

@ -15566,7 +15566,6 @@ in
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
}; };