From 9b187c0be17f73cd5818a09e69c5668a60763fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 Mar 2013 12:08:56 +0100 Subject: [PATCH] wxGTK: temporarily disable gstreamer support Currently it needs gconf2 which depends on orbit, which seems unmaintained and doesn't even build with new glib. --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ac0d2fc5bd..85dad50d12e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5103,12 +5103,14 @@ let wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gnome) GConf; + #inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib + GConf = null; gstreamer = null; gst_plugins_base = null; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { - inherit (gnome) GConf; + #inherit (gnome) GConf; # disable gstreamer until orbit gets fixed for new glib + GConf = null; gstreamer = null; gst_plugins_base = null; withMesa = lib.elem system lib.platforms.mesaPlatforms; };