From 72a8019334c9d27925ae6a006d925159d9a23e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 6 Aug 2013 09:10:00 +0200 Subject: [PATCH] introspection disabling -- clutter-gtk, NM-applet, gnome_panel Didn't build as it was, and not needed anywhere AFAIK. --- pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix | 3 ++- pkgs/development/libraries/clutter-gtk/0.10.8.nix | 2 ++ pkgs/development/libraries/clutter-gtk/default.nix | 2 ++ pkgs/tools/networking/network-manager-applet/default.nix | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 6ca2a9142c1..277ca9a1a69 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkgconfig intltool which ]; - configureFlags = "--disable-scrollkeeper"; + + configureFlags = [ "--disable-scrollkeeper" "--disable-introspection"/*not useful AFAIK*/ ]; NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2"; } diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index 182040f5c41..bce5dd1b489 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ clutter gtk ]; nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + postBuild = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 3e13ff2da7e..d3878379027 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ clutter gtk3 ]; nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + postBuild = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 69c7b77e3f9..81bf7c908ef 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ];