diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-12 03:22:27 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-12 03:22:27 +0200 |
| commit | 96dd66bf25195bb8036bf041a3d372898e660067 (patch) | |
| tree | 955b7fb0cf57d37e43f3ef553d34544fc7e873ae | |
| parent | 18297893a38154e22e0276fb094be74d73c55de7 (diff) | |
| download | nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar.gz nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar.bz2 nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar.lz nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar.xz nixlib-96dd66bf25195bb8036bf041a3d372898e660067.tar.zst nixlib-96dd66bf25195bb8036bf041a3d372898e660067.zip | |
Revert "wxGTK: temporarily disable gstreamer support"
This reverts commit 9b187c0be17f73cd5818a09e69c5668a60763fa2. Orbit should work again, thanks to @MarcWeber.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a360809b9d6..10f71a834ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5138,14 +5138,12 @@ let wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - #inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib - GConf = null; gstreamer = null; gst_plugins_base = null; + inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { - #inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib - GConf = null; gstreamer = null; gst_plugins_base = null; + inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; |