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

Revert "wxGTK: temporarily disable gstreamer support"

Browse Source 
This reverts commit 9b187c0be17f73cd5818a09e69c5668a60763fa2.
Orbit should work again, thanks to @MarcWeber.
This commit is contained in:
Vladimír Čunát 2013-04-12 03:22:27 +02:00
parent 18297893a3
commit 96dd66bf25
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5138,14 +5138,12 @@ let
wxGTK = wxGTK28; wxGTK = wxGTK28;
wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
#inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib inherit (gnome) GConf;
GConf = null; gstreamer = null; gst_plugins_base = null;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
#inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib inherit (gnome) GConf;
GConf = null; gstreamer = null; gst_plugins_base = null;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };