From 96dd66bf25195bb8036bf041a3d372898e660067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 12 Apr 2013 03:22:27 +0200 Subject: [PATCH] Revert "wxGTK: temporarily disable gstreamer support" This reverts commit 9b187c0be17f73cd5818a09e69c5668a60763fa2. Orbit should work again, thanks to @MarcWeber. --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file 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; };